From 7470bf6b97eed6732fd1e076bb290f4f97e402a3 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sat, 3 Sep 2016 22:00:20 -0300 Subject: Core/Transport: do not relocate players on board of vehicles when near teleporting. Vehicle should take care of that --- src/server/game/Entities/Transport/Transport.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index da9c713d5a9..fad197949a8 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -616,6 +616,11 @@ bool Transport::TeleportTransport(uint32 newMapid, float x, float y, float z, fl { if ((*itr)->GetTypeId() == TYPEID_PLAYER) { + // will be relocated in UpdatePosition of the vehicle + if (Unit* veh = (*itr)->ToUnit()->GetVehicleBase()) + if (veh->GetTransport() == this) + continue; + float destX, destY, destZ, destO; (*itr)->m_movementInfo.transport.pos.GetPosition(destX, destY, destZ, destO); TransportBase::CalculatePassengerPosition(destX, destY, destZ, &destO, x, y, z, o); -- cgit v1.2.3