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

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 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;
         }