diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-06-23 16:44:37 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-06-23 16:44:37 +0200 |
| commit | 396f87c30dff1b50f1eb0d924778a7fbab7e8d11 (patch) | |
| tree | 6dda1fbf143a6a49cc0afa00e110d3fea34137ba /src/server/game/Handlers/MovementHandler.cpp | |
| parent | b3ee407707db01a5bc49f544a56b1db381687f65 (diff) | |
Entities/Unit: Cleanup all the direct accesses to m_unitMovedByMe. Refactor the field to be protected. Add assertions to catch dangling pointers.
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MovementHandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index e2030f62303..cdbb939518f 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -216,7 +216,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recvData) uint32 sequenceIndex, time; recvData >> sequenceIndex >> time; - Player* plMover = _player->m_unitMovedByMe->ToPlayer(); + Player* plMover = _player->GetUnitBeingMoved()->ToPlayer(); if (!plMover || !plMover->IsBeingTeleportedNear()) return; @@ -260,7 +260,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvData) { uint16 opcode = recvData.GetOpcode(); - Unit* mover = _player->m_unitMovedByMe; + Unit* mover = _player->GetUnitBeingMoved(); ASSERT(mover != nullptr); // there must always be a mover @@ -521,8 +521,8 @@ void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recvData) recvData >> guid; if (GetPlayer()->IsInWorld()) - if (_player->m_unitMovedByMe->GetGUID() != guid) - TC_LOG_DEBUG("network", "HandleSetActiveMoverOpcode: incorrect mover guid: mover is %s and should be %s" , guid.ToString().c_str(), _player->m_unitMovedByMe->GetGUID().ToString().c_str()); + if (_player->GetUnitBeingMoved()->GetGUID() != guid) + TC_LOG_DEBUG("network", "HandleSetActiveMoverOpcode: incorrect mover guid: mover is %s and should be %s" , guid.ToString().c_str(), _player->GetUnitBeingMoved()->GetGUID().ToString().c_str()); } void WorldSession::HandleMoveNotActiveMover(WorldPacket &recvData) @@ -555,7 +555,7 @@ void WorldSession::HandleMoveKnockBackAck(WorldPacket& recvData) ObjectGuid guid; recvData >> guid.ReadAsPacked(); - if (_player->m_unitMovedByMe->GetGUID() != guid) + if (_player->GetUnitBeingMoved()->GetGUID() != guid) return; recvData.read_skip<uint32>(); // unk |