Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: Fixed transport teleports on the same map (and teleporting on transports too)

Browse Source
This commit is contained in:
Shauren
2018-03-19 00:22:55 +01:00
committed by Aokromes
parent e0dd75b626
commit 97bd2e2f2f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Transport/Transport.cpp
View File

@@ -507,6 +507,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);
@@ -619,6 +620,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)
{
@@ -637,7 +640,6 @@ bool Transport::TeleportTransport(uint32 newMapid, float x, float y, float z, fl
}
}
UpdatePosition(x, y, z, o);
return false;
}
}