aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorclick <none@none>2010-10-21 22:09:45 +0200
committerclick <none@none>2010-10-21 22:09:45 +0200
commit8ac91ada229b556d6ca306492bffbcb7a7db2ac0 (patch)
tree613f0bf45484a2c686924c7fa817229ebe41f7af /src
parentea847598d0514cf6107583da983fb3c273703902 (diff)
Core/Unit: Fix leave combat timer - original patch by Laise
Needs further testing, give feedback if wrong. --HG-- branch : trunk
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 5981c8ea9af..5a9f3a19ca3 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -253,7 +253,7 @@ void Unit::Update(uint32 p_time)
{
// m_CombatTimer set at aura start and it will be freeze until aura removing
if (m_CombatTimer <= p_time)
- ClearInCombat();
+ CombatStop();
else
m_CombatTimer -= p_time;
}