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

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

Browse Source
This commit is contained in:
ccrs
2019-10-23 03:28:57 +02:00
parent bc9a9ad7e1
commit c9c6871659
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Movement/MotionMaster.cpp
View File

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