diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2018-06-15 12:49:11 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-09-29 00:00:57 +0200 |
| commit | 4487933bd078c2d0087610de967f69f46cf4da60 (patch) | |
| tree | 98c836e1558b632deacae42ab67bec685b447d52 /src | |
| parent | 30583be0252ff02f190e74d6f5a69da3e5ea7bb5 (diff) | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Movement/MovementGenerators/GenericMovementGenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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()); |