*Merge.

*"Fix Glowing Blood" is not merged. Outdated patch?

--HG--
branch : trunk

1 files changed, 6 insertions, 4 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 115906e94a3..d31e6dec1a1 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -478,7 +478,12 @@ void Creature::Update(uint32 diff)
                 break;
 
             // if creature is charmed, switch to charmed AI
-            UpdateCharmAI();
+            if(NeedChangeAI)
+            {
+                UpdateCharmAI();
+                NeedChangeAI = false;
+                IsAIEnabled = true;
+            }
 
             if(!IsInEvadeMode() && IsAIEnabled)
             {
@@ -1613,9 +1618,6 @@ void Creature::setDeathState(DeathState s)
 
         if (canFly() && FallGround())
             return;
-
-        if(!IsStopped())
-            StopMoving();
     }
     Unit::setDeathState(s);