From a1319a20200d44a6893287e7a0b4bf05b0f9a0ef Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Fri, 22 Oct 2010 03:59:08 +0200
Subject: Core/Unit: Revert r457923c3f3 - combattimer handling from that
 revision is wrong, as it dictates wether not a creature will actually enter
 combat or not - with the earlier change this ment that any creature entering
 combat would not properly continue if target moved.

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

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 5a9f3a19ca3..5981c8ea9af 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)
-                CombatStop();
+                ClearInCombat();
             else
                 m_CombatTimer -= p_time;
         }
-- 
cgit v1.2.3