From d2065b0e502265e9b9127b1e4391b47b62a46b84 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Mon, 18 Nov 2013 20:57:02 +0100 Subject: Core/Transports: Fix triggered assertion in Transports Relocate only Players in world when updating transport's and its passengers' positions. Thanks vlad852 . Closes #11209 . --- src/server/game/Entities/Transport/Transport.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 2663add5db1..ddb0775dc01 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -530,7 +530,9 @@ void Transport::UpdatePassengerPositions(std::set& passengers) break; } case TYPEID_PLAYER: - GetMap()->PlayerRelocation(passenger->ToPlayer(), x, y, z, o); + //relocate only passengers in world and skip any player that might be still logging in/teleporting + if (passenger->IsInWorld()) + GetMap()->PlayerRelocation(passenger->ToPlayer(), x, y, z, o); break; case TYPEID_GAMEOBJECT: GetMap()->GameObjectRelocation(passenger->ToGameObject(), x, y, z, o, false); -- cgit v1.2.3