From 70f1cd2015651a2173efd6980b517ae9c3ee5f5a Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 19 Mar 2018 00:22:55 +0100 Subject: Core/Movement: Fixed transport teleports on the same map (and teleporting on transports too) --- 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 a9343c68466..cdfaa3f33c9 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -513,6 +513,7 @@ void Transport::UpdatePosition(float x, float y, float z, float o) Cell oldCell(GetPositionX(), GetPositionY()); Relocate(x, y, z, o); + m_stationaryPosition.SetOrientation(o); UpdateModelPosition(); UpdatePassengerPositions(_passengers); @@ -625,6 +626,8 @@ bool Transport::TeleportTransport(uint32 newMapid, float x, float y, float z, fl } else { + UpdatePosition(x, y, z, o); + // Teleport players, they need to know it for (PassengerSet::iterator itr = _passengers.begin(); itr != _passengers.end(); ++itr) { @@ -643,7 +646,6 @@ bool Transport::TeleportTransport(uint32 newMapid, float x, float y, float z, fl } } - UpdatePosition(x, y, z, o); return false; } } -- cgit v1.2.3