From e51b7756369e8763701981dce023276350725437 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 6 Jan 2022 10:58:06 -0500 Subject: [PATCH] Core/Movement: Fix WaypointMovementGenerator ignoring EscortAI::SetEscortPaused() on Gossip Hello Port From (https://github.com/TrinityCore/TrinityCore/commit/f1f1bc01ba418056bdfd311fc9df218213e83009) --- Source/Game/Movement/Generators/WaypointMovement.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Game/Movement/Generators/WaypointMovement.cs b/Source/Game/Movement/Generators/WaypointMovement.cs index 0e3230ef5..a491db71c 100644 --- a/Source/Game/Movement/Generators/WaypointMovement.cs +++ b/Source/Game/Movement/Generators/WaypointMovement.cs @@ -54,6 +54,10 @@ namespace Game.Movement { if (timer != 0) { + // Don't try to paused an already paused generator + if (HasFlag(MovementGeneratorFlags.Paused)) + return; + AddFlag(MovementGeneratorFlags.TimedPaused); _nextMoveTime.Reset((int)timer); RemoveFlag(MovementGeneratorFlags.Paused);