Core/Misc: A variety of clean-up changes:

Port From (https://github.com/TrinityCore/TrinityCore/commit/5aee452943e5c76f54f58eea9e6880b54a61ec9c)
2021-05-18 12:31:45 -04:00
parent c92693102d
commit 66ba3fe724
4 changed files with 8 additions and 10 deletions
@@ -239,12 +239,12 @@ namespace Game.AI

                return me.GetVictim() != null;
            }
-            else if (me.GetThreatManager().IsThreatListEmpty(true))
+            else if (!me.IsInCombat())
            {
                EnterEvadeMode(EvadeReason.NoHostiles);
                return false;
            }
-            else
+            else if (me.GetVictim() != null)
                me.AttackStop();

            return true;