diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 778f40379e5..b47a32c3354 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -621,6 +621,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);