*Try to fix the bug that some bosses stuck in combat

--HG--
branch : trunk

1 files changed, 7 insertions, 2 deletions

diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h
index 09efb138574..b35d5d7ed01 100644
--- a/src/game/CreatureAIImpl.h
+++ b/src/game/CreatureAIImpl.h
@@ -340,12 +340,17 @@ inline bool CreatureAI::UpdateVictim()
 
 inline bool CreatureAI::_EnterEvadeMode()
 {
-    if(me->IsInEvadeMode() || !me->isAlive())
+    if(!me->isAlive())
         return false;
 
-    me->RemoveAllAuras();
+    // sometimes bosses stuck in combat?
     me->DeleteThreatList();
     me->CombatStop(true);
+
+    if(me->IsInEvadeMode())
+        return false;
+
+    me->RemoveAllAuras();
     me->LoadCreaturesAddon();
     me->SetLootRecipient(NULL);
     me->ResetPlayerDamageReq();