From cf430ce61abf334e614945985dd10e126af0e3e5 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 22 Jan 2020 20:42:02 +0100 Subject: [PATCH] Core/Movement: merge 335 feedback changes for interrupt handing --- src/server/game/Entities/Unit/Unit.cpp | 5 +++-- src/server/game/Entities/Unit/Unit.h | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index d4472a97c9..c82584c489 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -409,8 +409,6 @@ Unit::Unit(bool isWorldObject) : _oldFactionId = 0; _isWalkingBeforeCharm = false; - - _positionUpdateInfo = PositionUpdateInfo(); } //////////////////////////////////////////////////////////// @@ -530,6 +528,9 @@ void Unit::Update(uint32 p_time) else if (!movespline->Finalized()) InterruptMovementBasedAuras(); + // All position info based actions have been executed, reset info + _positionUpdateInfo.Reset(); + // Update serverside orientation of channeled spells that are suposed to track the channel target if (Spell const* spell = m_currentSpells[CURRENT_CHANNELED_SPELL]) if (spell->GetSpellInfo()->HasAttribute(SPELL_ATTR1_CHANNEL_TRACK_TARGET)) diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 6c07070cfe..497e9df301 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -946,10 +946,14 @@ enum PlayerTotemType struct PositionUpdateInfo { - PositionUpdateInfo() : Relocated(false), Turned(false) { } + void Reset() + { + Relocated = false; + Turned = false; + } - bool Relocated; - bool Turned; + bool Relocated = false; + bool Turned = false; }; // delay time next attack to prevent client attack animation problems