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

@@ -54,7 +54,6 @@
#include "SharedDefines.h"
#include "SocialMgr.h"
#include "SystemPackets.h"
#include "Transport.h"
#include "World.h"
#include "WorldPacket.h"
#include "boost/asio/ip/address.hpp"
@@ -931,26 +930,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder const& holder)
loginVerifyWorld.Pos = pCurrChar->GetPosition();
SendPacket(loginVerifyWorld.Write());
// check if player is on transport and not added earlier to transport
// e.g. in case of loading transport on grid load
if (pCurrChar->GetTransportSpawnID() && !pCurrChar->GetTransport())
{
Transport* transport = nullptr;
auto bounds = pCurrChar->GetMap()->GetGameObjectBySpawnIdStore().equal_range(pCurrChar->GetTransportSpawnID());
if (bounds.first != bounds.second)
transport = bounds.first->second->ToTransport();
if (transport)
transport->AddPassenger(pCurrChar);
else
{
pCurrChar->SetTransport(nullptr);
pCurrChar->m_movementInfo.transport.Reset();
pCurrChar->SetTransportSpawnID(0);
}
}
pCurrChar->UpdatePositionData();
pCurrChar->RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags::Login);
pCurrChar->SendInitialPacketsAfterAddToMap();