Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Entities: Merge duplicate functions calculating relative positions - remove CalculatePassengerPosition/CalculatePassengerOffset from TransportBase class

Browse Source
This commit is contained in:
Shauren
2025-10-14 13:11:41 +02:00
parent d48e977315
commit a8f01e07d1
28 changed files with 141 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/server/game/Handlers/MovementHandler.cpp
View File

@@ -119,14 +119,13 @@ void WorldSession::HandleMoveWorldportAck()
if (player->m_teleport_dest.TransportGuid)
{
if (Transport* newTransport = newMap->GetTransport(*player->m_teleport_dest.TransportGuid))
if (GameObject* go = newMap->GetTransport(*player->m_teleport_dest.TransportGuid))
{
newTransport->AddPassenger(player);
player->m_movementInfo.transport.pos.Relocate(loc.Location);
float x, y, z, o;
loc.Location.GetPosition(x, y, z, o);
newTransport->CalculatePassengerPosition(x, y, z, &o);
player->Relocate(x, y, z, o);
if (TransportBase* newTransport = go->ToTransportBase())
{
newTransport->AddPassenger(player, loc.Location);
player->Relocate(newTransport->GetPositionWithOffset(loc.Location));
}
}
}
else if (TransportBase* transport = player->GetTransport())
@@ -297,14 +296,13 @@ void WorldSession::HandleMoveTeleportAck(WorldPackets::Movement::MoveTeleportAck
if (dest.TransportGuid)
{
if (Transport* transport = plMover->GetMap()->GetTransport(*dest.TransportGuid))
if (GameObject* go = plMover->GetMap()->GetGameObject(*dest.TransportGuid))
{
transport->AddPassenger(plMover);
plMover->m_movementInfo.transport.pos.Relocate(destLocation);
float x, y, z, o;
dest.Location.GetPosition(x, y, z, o);
transport->CalculatePassengerPosition(x, y, z, &o);
destLocation.Relocate(x, y, z, o);
if (TransportBase* transport = go->ToTransportBase())
{
transport->AddPassenger(plMover, destLocation);
destLocation.Relocate(transport->GetPositionWithOffset(plMover->m_movementInfo.transport.pos));
}
}
}
@@ -397,7 +395,7 @@ void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movem
{
if (GameObject* go = plrMover->GetMap()->GetGameObject(movementInfo.transport.guid))
if (TransportBase* transport = go->ToTransportBase())
transport->AddPassenger(plrMover);
transport->AddPassenger(plrMover, movementInfo.transport.pos);
}
else if (plrMover->GetTransport()->GetTransportGUID() != movementInfo.transport.guid)
{
@@ -405,7 +403,7 @@ void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movem
if (GameObject* go = plrMover->GetMap()->GetGameObject(movementInfo.transport.guid))
{
if (TransportBase* transport = go->ToTransportBase())
transport->AddPassenger(plrMover);
transport->AddPassenger(plrMover, movementInfo.transport.pos);
else
movementInfo.ResetTransport();
}