NPCBots: Fix a bug where bot would not stop attacking a target after …

…they use Vanish or Feign Death (cherry picked from commit 09dcb8ec0e4051e58a6d764d7e7f1c3c7cee3784) # Conflicts: # src/server/game/Entities/Unit/Unit.cpp
trickerer · Nov 7, 2024 · 7ac618b · 7ac618b
1 parent 18ac8f0
commit 7ac618b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 0 deletions.
diff --git a/src/server/game/AI/NpcBots/bot_ai.cpp b/src/server/game/AI/NpcBots/bot_ai.cpp
@@ -11366,6 +11366,13 @@ void bot_ai::OnOwnerVehicleDamagedBy(Unit* attacker)
     SetBotCommandState(BOT_COMMAND_ATTACK);
     me->GetVehicleBase()->Attack(attacker, false);
 }
+void bot_ai::OnAttackStop(Unit const* target)
+{
+    if (opponent == target)
+        opponent = nullptr;
+    if (disttarget == target)
+        disttarget = nullptr;
+}
 //////////
 ///LOOT///
 //////////

diff --git a/src/server/game/AI/NpcBots/bot_ai.h b/src/server/game/AI/NpcBots/bot_ai.h
@@ -288,6 +288,7 @@ class bot_ai : public CreatureAI
         void OnBotOwnerSpellGo(Spell const* spell, bool ok = true);
         void OnBotChannelFinish(Spell const* spell);
         void OnOwnerVehicleDamagedBy(Unit* attacker);
+        void OnAttackStop(Unit const* target);
         virtual void OnClassSpellStart(SpellInfo const* /*spellInfo*/) {}
         virtual void OnClassSpellGo(SpellInfo const* /*spell*/) {}
         virtual void OnClassChannelFinish(Spell const* /*spell*/) {}

diff --git a/src/server/game/AI/NpcBots/botmgr.cpp b/src/server/game/AI/NpcBots/botmgr.cpp
@@ -3036,6 +3036,14 @@ void BotMgr::OnBotPartyEngage(Player const* owner)
         owner->GetBotMgr()->PropagateEngageTimers();
 }
 
+void BotMgr::OnBotAttackStop(Creature const* bot, Unit const* target)
+{
+    if (bot->IsNPCBot())
+        bot->GetBotAI()->OnAttackStop(target);
+    else if (bot->IsNPCBotPet())
+        bot->GetBotPetAI()->OnAttackStop(target);
+}
+
 void BotMgr::ApplyBotEffectMods(Unit const* caster, SpellInfo const* spellInfo, uint8 effIndex, float& value)
 {
     caster->ToCreature()->GetBotAI()->ApplyBotEffectMods(spellInfo, effIndex, value);

diff --git a/src/server/game/AI/NpcBots/botmgr.h b/src/server/game/AI/NpcBots/botmgr.h
@@ -207,6 +207,7 @@ class AC_GAME_API BotMgr
         static void OnBotOwnerEnterVehicle(Player const* passenger, Vehicle const* vehicle);
         static void OnBotOwnerExitVehicle(Player const* passenger, Vehicle const* vehicle);
         static void OnBotPartyEngage(Player const* owner);
+        static void OnBotAttackStop(Creature const* bot, Unit const* target);
         //mod hooks
         static void ApplyBotEffectMods(Unit const* caster, SpellInfo const* spellInfo, uint8 effIndex, float& value);
         static void ApplyBotThreatMods(Unit const* attacker, SpellInfo const* spellInfo, float& threat);

diff --git a/src/server/game/AI/NpcBots/bpet_ai.cpp b/src/server/game/AI/NpcBots/bpet_ai.cpp
@@ -1409,6 +1409,11 @@ void bot_pet_ai::OnOwnerDamagedBy(Unit* attacker)
     SetBotCommandState(BOT_COMMAND_COMBATRESET);
     me->Attack(attacker, IsPetMelee());
 }
+void bot_pet_ai::OnAttackStop(Unit const* target)
+{
+    if (opponent == target)
+        opponent = nullptr;
+}
 
 bool bot_pet_ai::IsPetMelee() const
 {

diff --git a/src/server/game/AI/NpcBots/bpet_ai.h b/src/server/game/AI/NpcBots/bpet_ai.h
@@ -71,6 +71,8 @@ class bot_pet_ai : public CreatureAI
         //virtual uint32 GetAIMiscValue(uint32 /*data*/) const { return 0; }
         //virtual void SetAIMiscValue(uint32 /*data*/, uint32 /*value*/) {}
 
+        void OnAttackStop(Unit const* target);
+
         void OnBotPetSpellInterrupted(SpellSchoolMask schoolMask, uint32 unTimeMs);
         void OnBotPetSpellGo(Spell const* spell, bool ok = true);
         virtual void OnPetClassSpellGo(SpellInfo const* /*spellInfo*/) {}

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -11061,6 +11061,11 @@ bool Unit::AttackStop()
         {
             creature->SetNoSearchAssistance(false);
         }
+
+        //npcbot
+        if (IsNPCBotOrPet())
+            BotMgr::OnBotAttackStop(creature, victim);
+        //end npcbot
     }
 
     SendMeleeAttackStop(victim);