diff options
| author | Carbenium <carbenium@outlook.com> | 2015-07-10 00:38:01 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-12 12:47:53 +0100 |
| commit | 9b6ccdc49f39f0699e38d53d60d7a74c238a3a89 (patch) | |
| tree | ab9051b205bebf8444582d0c65a8f3ff3b5c605d | |
| parent | 1915a4ad49e2767a57adcf5662b43ad8690005d1 (diff) | |
Merge pull request #15023 from robinsch/combatMovement
SmartAI: Incorrect removal of movement at SetCombatMove
(cherry picked from commit a6f7bb029c8d29c19de8596d5d402222ca6c00a2)
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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(); |