diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2019-10-21 13:55:23 +0200 |
|---|---|---|
| committer | ccrs <ccrs@users.noreply.github.com> | 2019-10-21 13:55:23 +0200 |
| commit | d033032d33cff5dae76000f8432d78746cda9e06 (patch) | |
| tree | b86e1249c45f69dc5f03c836376807fd6cd6d3ed /src/server/game/Entities | |
| parent | 69b7958ebcebbf52e95323f4578cfbffe51635d6 (diff) | |
Core/Movement: delay movement update in MotionMaster until its owner signals AddToWorld
ref #23199
closes #23876
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 68b3322efe2..4103bef317c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9455,8 +9455,11 @@ void Unit::RestoreDisabledAI() void Unit::AddToWorld() { - if (!IsInWorld()) - WorldObject::AddToWorld(); + if (IsInWorld()) + return; + + WorldObject::AddToWorld(); + i_motionMaster->AddToWorld(); } void Unit::RemoveFromWorld() |