nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Movement): Handle player-controlled vehicles on transports (#23860)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2025-11-23 04:06:57 -06:00
committed by GitHub
parent e740f21680
commit 5c15bca66f
1 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,33 +415,31 @@ void WorldSession::HandleMoverRelocation(MovementInfo& movementInfo, Unit* mover
if (mover->m_movementInfo.HasMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
{
// if we boarded a transport, add us to it
if (Player* plrMover = mover->ToPlayer())
// if we boarded a transport, add us to it (generalized for both players and creatures)
if (!mover->GetTransport())
{
if (!plrMover->GetTransport())
if (Transport* transport = mover->GetMap()->GetTransport(movementInfo.transport.guid))
{
if (Transport* transport = plrMover->GetMap()->GetTransport(movementInfo.transport.guid))
{
plrMover->m_transport = transport;
transport->AddPassenger(plrMover);
}
mover->SetTransport(transport);
transport->AddPassenger(mover);
}
else if (plrMover->GetTransport()->GetGUID() != movementInfo.transport.guid)
}
else if (mover->GetTransport()->GetGUID() != movementInfo.transport.guid)
{
// Switching transports
bool foundNewTransport = false;
mover->GetTransport()->RemovePassenger(mover);
if (Transport* transport = mover->GetMap()->GetTransport(movementInfo.transport.guid))
{
bool foundNewTransport = false;
plrMover->m_transport->RemovePassenger(plrMover);
if (Transport* transport = plrMover->GetMap()->GetTransport(movementInfo.transport.guid))
{
foundNewTransport = true;
plrMover->m_transport = transport;
transport->AddPassenger(plrMover);
}
foundNewTransport = true;
mover->SetTransport(transport);
transport->AddPassenger(mover);
}
if (!foundNewTransport)
{
plrMover->m_transport = nullptr;
movementInfo.transport.Reset();
}
if (!foundNewTransport)
{
mover->SetTransport(nullptr);
movementInfo.transport.Reset();
}
}
@@ -449,23 +447,20 @@ void WorldSession::HandleMoverRelocation(MovementInfo& movementInfo, Unit* mover
{
GameObject* go = mover->GetMap()->GetGameObject(movementInfo.transport.guid);
if (!go || go->GetGoType() != GAMEOBJECT_TYPE_TRANSPORT)
{
movementInfo.RemoveMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
}
}
}
else if (mover->IsPlayer())
else
{
if (Player* plrMover = mover->ToPlayer())
// if we were on a transport, leave (handles both players and creatures)
if (Transport* transport = mover->GetTransport())
{
if (plrMover->GetTransport()) // if we were on a transport, leave
{
sScriptMgr->AnticheatSetUnderACKmount(plrMover); // just for safe
if (mover->IsPlayer())
sScriptMgr->AnticheatSetUnderACKmount(mover->ToPlayer()); // just for safe
plrMover->m_transport->RemovePassenger(plrMover);
plrMover->m_transport = nullptr;
movementInfo.transport.Reset();
}
transport->RemovePassenger(mover);
mover->SetTransport(nullptr);
movementInfo.transport.Reset();
}
}