From edc75831194bc2419e3abada47121fadf4b2aa8d Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 23 Jun 2019 16:44:37 +0200 Subject: Entities/Unit: Cleanup all the direct accesses to m_unitMovedByMe. Refactor the field to be protected. Add assertions to catch dangling pointers. (cherry picked from commit 396f87c30dff1b50f1eb0d924778a7fbab7e8d11) --- src/server/game/Handlers/MovementHandler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Handlers/MovementHandler.cpp') diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index c546e964f8a..43fdc510b8a 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -249,7 +249,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPackets::Movement::MoveTeleportAck { TC_LOG_DEBUG("network", "CMSG_MOVE_TELEPORT_ACK: Guid: %s, Sequence: %u, Time: %u", packet.MoverGUID.ToString().c_str(), packet.AckIndex, packet.MoveTime); - Player* plMover = _player->m_unitMovedByMe->ToPlayer(); + Player* plMover = _player->GetUnitBeingMoved()->ToPlayer(); if (!plMover || !plMover->IsBeingTeleportedNear()) return; @@ -296,7 +296,7 @@ void WorldSession::HandleMovementOpcodes(WorldPackets::Movement::ClientPlayerMov void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movementInfo) { - Unit* mover = _player->m_unitMovedByMe; + Unit* mover = _player->GetUnitBeingMoved(); ASSERT(mover != nullptr); // there must always be a mover @@ -529,8 +529,8 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPackets::Movement::MovementSpe void WorldSession::HandleSetActiveMoverOpcode(WorldPackets::Movement::SetActiveMover& packet) { if (GetPlayer()->IsInWorld()) - if (_player->m_unitMovedByMe->GetGUID() != packet.ActiveMover) - TC_LOG_DEBUG("network", "HandleSetActiveMoverOpcode: incorrect mover guid: mover is %s and should be %s" , packet.ActiveMover.ToString().c_str(), _player->m_unitMovedByMe->GetGUID().ToString().c_str()); + if (_player->GetUnitBeingMoved()->GetGUID() != packet.ActiveMover) + TC_LOG_DEBUG("network", "HandleSetActiveMoverOpcode: incorrect mover guid: mover is %s and should be %s" , packet.ActiveMover.ToString().c_str(), _player->GetUnitBeingMoved()->GetGUID().ToString().c_str()); } void WorldSession::HandleMoveKnockBackAck(WorldPackets::Movement::MoveKnockBackAck& movementAck) -- cgit v1.2.3