From c13d83796f7b2111c5dcf8546bdd84eccd232ae3 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Sun, 21 Jul 2019 01:49:58 +0200
Subject: Core/AI: Finally move the "is creature engaged" flag to be a property
 of the creature AI, where it honestly always belonged. Fixes #17981 and
 #23602 for real this time.

(cherry picked from commit 0e7c66cb4c7ff7d44e232d0b50703a48605ffd24)
---
 .../scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp  | 5 +++--
 src/server/scripts/Kalimdor/zone_desolace.cpp                       | 4 +++-
 src/server/scripts/Kalimdor/zone_the_barrens.cpp                    | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/server/scripts/Kalimdor')

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index a8788d5da97..1ea1ccf835a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -423,9 +423,10 @@ void hyjalAI::EnterEvadeMode(EvadeReason /*why*/)
     if (me->GetEntry() != JAINA)
         me->RemoveAllAuras();
     me->CombatStop(true);
-    me->GetThreatManager().NotifyDisengaged();
+    
+    EngagementOver();
+    
     me->LoadCreaturesAddon();
-
     if (me->IsAlive())
         me->GetMotionMaster()->MoveTargetedHome();
 
diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 5a5e91e491c..46c6102e340 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -86,9 +86,11 @@ public:
 
                     me->UpdateEntry(NPC_TAMED_KODO);
                     me->CombatStop();
-                    me->GetThreatManager().NotifyDisengaged();
                     me->SetFaction(FACTION_FRIENDLY);
                     me->SetSpeedRate(MOVE_RUN, 0.6f);
+                    
+                    EngagementOver();
+                    
                     me->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, me->GetFollowAngle());
                     me->setActive(true);
                     me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index 422be2b9b15..5b5add35f17 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -215,11 +215,11 @@ public:
         {
             me->RemoveAllAuras();
             me->CombatStop(true);
-            me->GetThreatManager().NotifyDisengaged();
-
             me->StopMoving();
+            
+            EngagementOver();
+            
             me->GetMotionMaster()->MoveIdle();
-
             me->SetFaction(FACTION_FRIENDLY_F);
             me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
         }
-- 
cgit v1.2.3