diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Transport/Transport.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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); |