Merge pull request #15023 from robinsch/combatMovement

SmartAI: Incorrect removal of movement at SetCombatMove

src/server/game/AI/SmartScripts/SmartAI.cpp

@@ -763,6 +763,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();