From 9b6ccdc49f39f0699e38d53d60d7a74c238a3a89 Mon Sep 17 00:00:00 2001
From: Carbenium <carbenium@outlook.com>
Date: Fri, 10 Jul 2015 00:38:01 +0200
Subject: Merge pull request #15023 from robinsch/combatMovement

SmartAI: Incorrect removal of movement at SetCombatMove
(cherry picked from commit a6f7bb029c8d29c19de8596d5d402222ca6c00a2)
---
 src/server/game/AI/SmartScripts/SmartAI.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index c66762e64a1..4203e796aa5 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -767,6 +767,9 @@ void SmartAI::SetCombatMove(bool on)
         }
         else
         {
+            if (me->HasUnitState(UNIT_STATE_CONFUSED_MOVE | UNIT_STATE_FLEEING_MOVE))
+                return;
+
             me->GetMotionMaster()->MovementExpired();
             me->GetMotionMaster()->Clear(true);
             me->StopMoving();
-- 
cgit v1.2.3