diff options
| author | Carbenium <carbenium@outlook.com> | 2015-07-10 00:38:01 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-07-10 00:38:01 +0200 |
| commit | a6f7bb029c8d29c19de8596d5d402222ca6c00a2 (patch) | |
| tree | f8324a5933dcadde9cd3b8bce6ac93d5f45b3e81 /src | |
| parent | fae826958915673338868d0b3b273860630638fb (diff) | |
| parent | 2b3ea2e1819839895091e0e8c1777dba4bc240a8 (diff) | |
Merge pull request #15023 from robinsch/combatMovement
SmartAI: Incorrect removal of movement at SetCombatMove
Diffstat (limited to 'src')
| -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 21a15fa4f99..0b040fc519a 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/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(); |