Core/Transports: undo all custom transport changes as preparation for cherry picks

This commit is contained in:
Ovahlord committed 2022-06-18 18:37:14 +02:00
1 parent 74c60fa456
commit 6e9ec1a4bf
46 files changed
+618 -1469

No files matched your search

+6 -15
View File
@@ -93,12 +93,9 @@ void WorldSession::HandleMoveWorldportAck()
return;
}
float x = loc.GetPositionX();
float y = loc.GetPositionY();
float o = loc.GetOrientation();
float z = loc.GetPositionZ() + GetPlayer()->GetHoverOffset();
GetPlayer()->Relocate(x, y, z, o);
GetPlayer()->Relocate(loc.GetPositionX(), loc.GetPositionY(), z, loc.GetOrientation());
GetPlayer()->SetFallInformation(0, GetPlayer()->GetPositionZ());
GetPlayer()->ResetMap();
@@ -115,16 +112,6 @@ void WorldSession::HandleMoveWorldportAck()
return;
}
if (Transport* transport = _player->GetTeleportTransport())
{
transport->CalculatePassengerOffset(x, y, z, &o);
_player->m_movementInfo.transport.pos.Relocate(x, y, z, o);
transport->AddPassenger(_player);
_player->ResetTeleportTransport();
}
// battleground state prepare (in case join to BG), at relogin/tele player not invited
// only add to bg group and object, if the player was invited (else he entered through command)
if (_player->InBattleground())
@@ -366,7 +353,11 @@ void WorldSession::HandleMovementOpcode(uint16 opcode, MovementInfo& movementInf
}
if (!mover->GetTransport() && !mover->GetVehicle())
movementInfo.transport.Reset();
{
GameObject* go = mover->GetMap()->GetGameObject(movementInfo.transport.guid);
if (!go || go->GetGoType() != GAMEOBJECT_TYPE_TRANSPORT)
movementInfo.transport.guid.Clear();
}
}
else if (plrMover && plrMover->GetTransport()) // if we were on a transport, leave
plrMover->m_transport->RemovePassenger(plrMover);