From 8b5112a616249700e13bd998b98efed3b32e4b95 Mon Sep 17 00:00:00 2001
From: nytmyr <53322305+nytmyr@users.noreply.github.com>
Date: Thu, 31 Oct 2024 23:21:42 -0500
Subject: [PATCH] oopsies

---
 zone/bot.cpp    | 16 ++++++----------
 zone/bot.h      |  2 +-
 zone/spells.cpp |  4 ++--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/zone/bot.cpp b/zone/bot.cpp
index 16f4b9db3..abc0865fa 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -87,7 +87,7 @@ Bot::Bot(NPCType *npcTypeData, Client* botOwner) : NPC(npcTypeData, nullptr, glm
 	SetGuardFlag(false);
 	SetHoldFlag(false);
 	SetAttackFlag(false);
-	SetCombatRoundForAlerts(true);
+	SetCombatRoundForAlerts(false);
 	SetAttackingFlag(false);
 	SetPullFlag(false);
 	SetPullingFlag(false);
@@ -211,7 +211,7 @@ Bot::Bot(
 	SetGuardFlag(false);
 	SetHoldFlag(false);
 	SetAttackFlag(false);
-	SetCombatRoundForAlerts(true);
+	SetCombatRoundForAlerts(false);
 	SetAttackingFlag(false);
 	SetPullFlag(false);
 	SetPullingFlag(false);
@@ -2106,7 +2106,6 @@ void Bot::AI_Process()
 // ATTACKING FLAG (HATE VALIDATION)
 
 		if (GetAttackingFlag() && tar->CheckAggro(this)) {
-			SetCombatRoundForAlerts(true);
 			SetAttackingFlag(false);
 		}
 
@@ -2277,7 +2276,7 @@ void Bot::AI_Process()
 	}
 	else { // Out-of-combat behavior
 		SetAttackFlag(false);
-		SetCombatRoundForAlerts(true);
+		SetCombatRoundForAlerts(false);
 		SetAttackingFlag(false);
 		if (!bot_owner->GetBotPulling()) {
 
@@ -2422,7 +2421,6 @@ bool Bot::TryAutoDefend(Client* bot_owner, float leash_distance) {
 						AddToHateList(hater, 1);
 						SetTarget(hater);
 						SetAttackingFlag();
-						SetCombatRoundForAlerts();
 
 						if (HasPet() && (GetClass() != Class::Enchanter || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
 							GetPet()->AddToHateList(hater, 1);
@@ -2884,7 +2882,7 @@ bool Bot::IsValidTarget(
 		SetTarget(nullptr);
 
 		SetAttackFlag(false);
-		SetCombatRoundForAlerts(true);
+		SetCombatRoundForAlerts(false);
 		SetAttackingFlag(false);
 
 		if (PULLING_BOT) {
@@ -2918,7 +2916,6 @@ Mob* Bot::GetBotTarget(Client* bot_owner)
 
 		WipeHateList();
 		SetAttackFlag(false);
-		SetCombatRoundForAlerts(true);
 		SetAttackingFlag(false);
 
 		if (PULLING_BOT) {
@@ -3137,7 +3134,6 @@ void Bot::SetOwnerTarget(Client* bot_owner) {
 	}
 
 	SetAttackFlag(false);
-	SetCombatRoundForAlerts(true);
 	SetAttackingFlag(false);
 	SetPullFlag(false);
 	SetPullingFlag(false);
@@ -3152,7 +3148,6 @@ void Bot::SetOwnerTarget(Client* bot_owner) {
 			WipeHateList();
 			AddToHateList(attack_target, 1);
 			SetTarget(attack_target);
-			SetCombatRoundForAlerts();
 			SetAttackingFlag();
 			if (GetPet() && (GetClass() != Class::Enchanter || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
 				GetPet()->WipeHateList();
@@ -3165,7 +3160,7 @@ void Bot::SetOwnerTarget(Client* bot_owner) {
 
 void Bot::BotPullerProcess(Client* bot_owner, Raid* raid) {
 	SetAttackFlag(false);
-	SetCombatRoundForAlerts(true);
+	SetCombatRoundForAlerts(false);
 	SetAttackingFlag(false);
 	SetPullFlag(false);
 	SetPullingFlag(false);
@@ -4915,6 +4910,7 @@ void Bot::TryBackstab(Mob *other, int ReuseTime) {
 
 	if (!botpiercer || (botpiercer->ItemType != EQ::item::ItemType1HPiercing)) {
 		if (!GetCombatRoundForAlerts()) {
+			SetCombatRoundForAlerts();
 			BotGroupSay(this, "I can't backstab with this weapon!");
 		}
 
diff --git a/zone/bot.h b/zone/bot.h
index 5836af133..0ee67c5ce 100644
--- a/zone/bot.h
+++ b/zone/bot.h
@@ -1105,7 +1105,7 @@ private:
 	int32 GenerateBaseManaPoints();
 	void GenerateSpecialAttacks();
 	void SetBotID(uint32 botID);
-	void SetCombatRoundForAlerts(bool flag = true) { m_combat_round_alert_flag; }
+	void SetCombatRoundForAlerts(bool flag = true) { m_combat_round_alert_flag = flag; }
 	void SetAttackingFlag(bool flag = true) { m_attacking_flag = flag; }
 	void SetPullingFlag(bool flag = true) { m_pulling_flag = flag; }
 	void SetReturningFlag(bool flag = true) { m_returning_flag = flag; }
diff --git a/zone/spells.cpp b/zone/spells.cpp
index df9bf3942..ce2041302 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -2560,9 +2560,9 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, in
 	float range = spells[spell_id].range + GetRangeDistTargetSizeMod(spell_target);
 	if (
 		(
-			(IsClient() && CastToClient()->TGB()) || (IsBot() && RuleB(Bots, EnableBotTGB)
+			(IsClient() && CastToClient()->TGB()) || (IsBot() && RuleB(Bots, EnableBotTGB))
 		) &&
-		IsTGBCompatibleSpell(spell_id) && IsGroupSpell(spell_id))
+		IsTGBCompatibleSpell(spell_id) && IsGroupSpell(spell_id)
 	) {
 		range = spells[spell_id].aoe_range;
 	}