Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 03:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: adjust deactivation/reset logic inside GenericMovementGenerator

Browse Source 
Deactivated GMGenerators will now Initialize if they never did.
Mimiron's script needs still some movement love.

closes #22037

(cherry picked from commit 24a9598e2c)
This commit is contained in:
ccrs
2018-06-15 12:49:11 +02:00
committed by Shauren
parent 30583be025
commit 4487933bd0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Movement/MovementGenerators/GenericMovementGenerator.cpp
View File

@@ -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());