diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 5c045a79049..5521a154ee1 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); |