aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-09-02 12:46:26 -0500
committermegamage <none@none>2009-09-02 12:46:26 -0500
commit8efb15c52a7e79c4f312b643ec7933e608effe47 (patch)
treefed7753924bf0a7225b665f7deb1a14c7c4ea1f5 /src/game/Unit.cpp
parentc150629f8d9ef38a25e939354b931098517874cc (diff)
*Try to fix the bug that creature does not regenerate after evade.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
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);