From 4487933bd078c2d0087610de967f69f46cf4da60 Mon Sep 17 00:00:00 2001 From: ccrs Date: Fri, 15 Jun 2018 12:49:11 +0200 Subject: Core/Movement: adjust deactivation/reset logic inside GenericMovementGenerator Deactivated GMGenerators will now Initialize if they never did. Mimiron's script needs still some movement love. closes #22037 (cherry picked from commit 24a9598e2c2d8c39f7b8f5b3f900b61466c8652a) --- .../game/Movement/MovementGenerators/GenericMovementGenerator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.cpp index 70f6861f8eb..94368304874 100644 --- a/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/GenericMovementGenerator.cpp @@ -36,14 +36,14 @@ GenericMovementGenerator::GenericMovementGenerator(Movement::MoveSplineInit&& sp void GenericMovementGenerator::Initialize(Unit* /*owner*/) { - if (HasFlag(MOVEMENTGENERATOR_FLAG_DEACTIVATED)) // Resume spline is not supported + if (HasFlag(MOVEMENTGENERATOR_FLAG_DEACTIVATED) && !HasFlag(MOVEMENTGENERATOR_FLAG_INITIALIZATION_PENDING)) // Resume spline is not supported { RemoveFlag(MOVEMENTGENERATOR_FLAG_DEACTIVATED); AddFlag(MOVEMENTGENERATOR_FLAG_FINALIZED); return; } - RemoveFlag(MOVEMENTGENERATOR_FLAG_INITIALIZATION_PENDING); + RemoveFlag(MOVEMENTGENERATOR_FLAG_INITIALIZATION_PENDING | MOVEMENTGENERATOR_FLAG_DEACTIVATED); AddFlag(MOVEMENTGENERATOR_FLAG_INITIALIZED); _duration.Reset(_splineInit.Launch()); -- cgit v1.2.3