josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Movement: Properly handle cases when jumping from one transport directly to another

Browse Source
This commit is contained in:
zori
2012-06-02 18:38:02 +02:00
committed by Shauren
parent a80ee1379e
commit b90050a528
1 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Handlers/MovementHandler.cpp
+28 -2
View File
@@ -295,19 +295,45 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData)
} }
// if we boarded a transport, add us to it // if we boarded a transport, add us to it
if (plrMover && !plrMover->GetTransport()) if (plrMover)
{
if (!plrMover->GetTransport())
{ {
// elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just dismount if the guid can be found in the transport list // elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just dismount if the guid can be found in the transport list
for (MapManager::TransportSet::const_iterator iter = sMapMgr->m_Transports.begin(); iter != sMapMgr->m_Transports.end(); ++iter) for (MapManager::TransportSet::const_iterator iter = sMapMgr->m_Transports.begin(); iter != sMapMgr->m_Transports.end(); ++iter)
{ {
if ((*iter)->GetGUID() == movementInfo.t_guid) if ((*iter)->GetGUID() == movementInfo.t_guid)
{ {
plrMover->m_transport = (*iter); plrMover->m_transport = *iter;
(*iter)->AddPassenger(plrMover); (*iter)->AddPassenger(plrMover);
break; break;
} }
} }
} }
else if (plrMover->GetTransport()->GetGUID() != movementInfo.t_guid)
{
bool foundNewTransport = false;
plrMover->m_transport->RemovePassenger(plrMover);
for (MapManager::TransportSet::const_iterator iter = sMapMgr->m_Transports.begin(); iter != sMapMgr->m_Transports.end(); ++iter)
{
if ((*iter)->GetGUID() == movementInfo.t_guid)
{
foundNewTransport = true;
plrMover->m_transport = *iter;
(*iter)->AddPassenger(plrMover);
break;
}
}
if (!foundNewTransport)
{
plrMover->m_transport = NULL;
movementInfo.t_pos.Relocate(0.0f, 0.0f, 0.0f, 0.0f);
movementInfo.t_time = 0;
movementInfo.t_seat = -1;
}
}
}
if (!mover->GetTransport() && !mover->GetVehicle()) if (!mover->GetTransport() && !mover->GetVehicle())
{ {