Core/Movement: prevent any Initialize queue till AddToWorld is signaled

1 files changed, 5 insertions, 1 deletions

diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index b2e2f1bbd43..5bc8d8928ee 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -95,7 +95,10 @@ MotionMaster::~MotionMaster()
 
 void MotionMaster::Initialize()
 {
-    if (HasFlag(MOTIONMASTER_FLAG_DELAYED))
+    if (HasFlag(MOTIONMASTER_FLAG_INITIALIZATION_PENDING))
+        return;
+
+    if (HasFlag(MOTIONMASTER_FLAG_UPDATE))
     {
         DelayedActionDefine action = [this]()
         {
@@ -121,6 +124,7 @@ void MotionMaster::AddToWorld()
     AddFlag(MOTIONMASTER_FLAG_INITIALIZING);
     RemoveFlag(MOTIONMASTER_FLAG_INITIALIZATION_PENDING);
 
+    DirectInitialize();
     ResolveDelayedActions();
 
     RemoveFlag(MOTIONMASTER_FLAG_INITIALIZING);