From 8d052d7d51fc087dfb59e61d70a5e48b348d767a Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 29 Sep 2021 19:23:47 -0400
Subject: [PATCH] Core/Movement: adjust deactivation/reset logic inside
 GenericMovementGenerator

Port From (https://github.com/TrinityCore/TrinityCore/commit/4487933bd078c2d0087610de967f69f46cf4da60)
---
 Source/Game/Movement/Generators/GenericMovementGenerator.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Game/Movement/Generators/GenericMovementGenerator.cs b/Source/Game/Movement/Generators/GenericMovementGenerator.cs
index 11f2abdb7..7bd6dd92f 100644
--- a/Source/Game/Movement/Generators/GenericMovementGenerator.cs
+++ b/Source/Game/Movement/Generators/GenericMovementGenerator.cs
@@ -48,14 +48,14 @@ namespace Game.Movement
 
         public override void Initialize(Unit owner)
         {
-            if (HasFlag(MovementGeneratorFlags.Deactivated)) // Resume spline is not supported
+            if (HasFlag(MovementGeneratorFlags.Deactivated) && !HasFlag(MovementGeneratorFlags.InitializationPending)) // Resume spline is not supported
             {
                 RemoveFlag(MovementGeneratorFlags.Deactivated);
                 AddFlag(MovementGeneratorFlags.Finalized);
                 return;
             }
 
-            RemoveFlag(MovementGeneratorFlags.InitializationPending);
+            RemoveFlag(MovementGeneratorFlags.InitializationPending | MovementGeneratorFlags.Deactivated);
             AddFlag(MovementGeneratorFlags.Initialized);
 
             _duration.Reset(_splineInit.Launch());