From 9aab2564e77dcf16ed9b577a47b8f04d0b17c0d5 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Fri, 4 Sep 2009 10:11:23 -0500
Subject: *Try to fix the bug that some bosses stuck in combat

--HG--
branch : trunk
---
 src/game/CreatureAIImpl.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

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();
-- 
cgit v1.2.3