From ef113ce673455a0bf112741bb6fd7673b71f7863 Mon Sep 17 00:00:00 2001 From: Chaouki Dhib Date: Sun, 4 Jul 2021 22:01:22 +0200 Subject: Revert "Core/Movement: Better handle cases of passing incomplete data to ReadMovementInfo()" This reverts commit 0c90970b0668df93356d035ecff8124b5dc5c44d. --- src/server/game/Server/WorldSession.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 5a6d42fd38f..e3c9ad3569c 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -927,16 +927,7 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi) mi->RemoveMovementFlag((maskToRemove)); #endif - Unit* mover = GetGameClient()->GetActivelyMovedUnit(); - if (!mover) - { - if (mi->guid.IsEmpty()) - { - TC_LOG_ERROR("entities.unit", "WorldSession::ReadMovementInfo: GetActivelyMovedUnit() returned no mover and mi->guid is empty, opcode %u", static_cast(data.GetOpcode())); - return; - } - mover = GetPlayer()->GetGUID() == mi->guid ? GetPlayer() : ObjectAccessor::GetUnit(*GetPlayer(), mi->guid); - } + Unit* mover = GetPlayer()->GetGUID() == mi->guid ? GetPlayer() : ObjectAccessor::GetUnit(*GetPlayer(), mi->guid); ASSERT(mover, "if the server allows this unit to be moved by the client, the unit should still exist!"); if (!GetPlayer()->GetVehicleBase() || !(GetPlayer()->GetVehicle()->GetVehicleInfo()->Flags & VEHICLE_FLAG_FIXED_POSITION)) -- cgit v1.2.3