From 5457d14d85f408bc848ba3c7a70447153bf8644f Mon Sep 17 00:00:00 2001
From: nytmyr <53322305+nytmyr@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:07:54 -0600
Subject: [PATCH] add bot checks to tryheadshot / tryassassinate

---
 zone/attack.cpp          | 1 +
 zone/special_attacks.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/zone/attack.cpp b/zone/attack.cpp
index e5b9baa84..ceca940b7 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -6446,6 +6446,7 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac
 		}
 		else {
 			int ass = TryAssassinate(defender, hit.skill);
+
 			if (ass > 0) {
 				hit.damage_done = ass;
 			}
diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp
index cd8b8ac91..e7c5350be 100644
--- a/zone/special_attacks.cpp
+++ b/zone/special_attacks.cpp
@@ -2453,7 +2453,7 @@ int Mob::TryHeadShot(Mob *defender, EQ::skills::SkillType skillInUse)
 	// Only works on YOUR target.
 	if (
 		defender &&
-		!defender->IsClient() &&
+		!defender->IsOfClientBot() &&
 		skillInUse == EQ::skills::SkillArchery &&
 		GetTarget() == defender &&
 		(defender->GetBodyType() == BodyType::Humanoid || !RuleB(Combat, HeadshotOnlyHumanoids)) &&
@@ -2466,7 +2466,7 @@ int Mob::TryHeadShot(Mob *defender, EQ::skills::SkillType skillInUse)
 		if (HeadShot_Dmg && HeadShot_Level && (defender->GetLevel() <= HeadShot_Level)) {
 			int chance = GetDEX();
 			chance = 100 * chance / (chance + 3500);
-			if (IsClient() || IsBot()) {
+			if (IsOfClientBot()) {
 				chance += GetHeroicDEX() / 25;
 			}
 			chance *= 10;
@@ -2490,7 +2490,7 @@ int Mob::TryAssassinate(Mob *defender, EQ::skills::SkillType skillInUse)
 {
 	if (
 		defender &&
-		!defender->IsClient() &&
+		!defender->IsOfClientBot() &&
 		GetLevel() >= RuleI(Combat, AssassinateLevelRequirement) &&
 		(skillInUse == EQ::skills::SkillBackstab || skillInUse == EQ::skills::SkillThrowing) &&
 		(defender->GetBodyType() == BodyType::Humanoid || !RuleB(Combat, AssassinateOnlyHumanoids)) &&