Core/AI: No longer do strange things when told to enter evade mode while there's no need to do so, typically by terrible legacy code.

(cherry picked from commit 163f44c1b08cc043b114585922bd08664434bf92)

3 files changed, 5 insertions, 4 deletions

diff --git a/src/common/Utilities/FuzzyFind.h b/src/common/Utilities/FuzzyFind.h
index e1c583af3b0..ae511456aa3 100644
--- a/src/common/Utilities/FuzzyFind.h
+++ b/src/common/Utilities/FuzzyFind.h
@@ -18,6 +18,10 @@
 #ifndef TRINITY_FUZZYFIND_H
 #define TRINITY_FUZZYFIND_H
 
+#include "advstd.h"
+#include <map>
+#include <string>
+
 namespace Trinity
 {
     namespace Containers
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 5052033971f..247fbd1bad7 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -292,7 +292,7 @@ void CreatureAI::EngagementOver()
 
 bool CreatureAI::_EnterEvadeMode(EvadeReason /*why*/)
 {
-    if (me->IsInEvadeMode())
+    if (!IsEngaged())
         return false;
 
     if (!me->IsAlive())
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index 8d7ba4994e0..00d590467a1 100644
--- a/src/server/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -265,10 +265,7 @@ void ObjectGridStoper::Visit(CreatureMapType &m)
         iter->GetSource()->RemoveAllDynObjects();
         iter->GetSource()->RemoveAllAreaTriggers();
         if (iter->GetSource()->IsInCombat())
-        {
             iter->GetSource()->CombatStop();
-            iter->GetSource()->AI()->EnterEvadeMode();
-        }
     }
 }