diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-02-01 14:47:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 14:47:06 +0100 |
| commit | a9e534762f2517a37d595cdfef527ab55b6339ba (patch) | |
| tree | 6ae2bb2fe66392114203b557fb7f705d616efb3d /src | |
| parent | 573ddf4d22564d022e30807c5ba2c6eb1a2c8b2e (diff) | |
Core/Movement: Fix WaypointMovementGenerator ignoring EscortAI::SetEscortPaused() on Gossip Hello (#24005)
Fix WaypointMovementGenerator ignoring EscortAI::SetEscortPaused() when talking to a NPC, scheduling a 3 minutes pause on the WaypointMovementGenerator even if it was already disabled with no timer, waiting for the player to select a gossip entry to resume the movement.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index 2fe843e4391..2b1d5da7bd0 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -55,6 +55,10 @@ void WaypointMovementGenerator<Creature>::Pause(uint32 timer/* = 0*/) { if (timer) { + // Don't try to paused an already paused generator + if (HasFlag(MOVEMENTGENERATOR_FLAG_PAUSED)) + return; + AddFlag(MOVEMENTGENERATOR_FLAG_TIMED_PAUSED); _nextMoveTime.Reset(timer); RemoveFlag(MOVEMENTGENERATOR_FLAG_PAUSED); |
