From 8efb15c52a7e79c4f312b643ec7933e608effe47 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 2 Sep 2009 12:46:26 -0500
Subject: *Try to fix the bug that creature does not regenerate after evade.

--HG--
branch : trunk
---
 src/game/Unit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/game/Unit.cpp')

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index e46f9ed9b55..e175896ca48 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10509,7 +10509,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
     if(PvP)
         m_CombatTimer = 5000;
 
-    if(isInCombat())
+    if(isInCombat() || hasUnitState(UNIT_STAT_EVADE))
         return;
 
     SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
-- 
cgit v1.2.3