diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-02-01 14:47:06 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-21 00:46:32 +0100 |
| commit | f1f1bc01ba418056bdfd311fc9df218213e83009 (patch) | |
| tree | d7e6cd5ad6b74ee60962c48d23aa289118de6c20 /src | |
| parent | 9124fd1f1fafea19b118eb69c6a35f94376fc7e8 (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.
(cherry picked from commit a9e534762f2517a37d595cdfef527ab55b6339ba)
Diffstat (limited to 'src')
| -rw-r--r-- | 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 6421de3eb02..7d1fc1f133f 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -56,6 +56,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); |
