Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Movement: Fix teleports to transports within the same map

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d48e97731538b01c4005cd7c73653a0f33015098)
This commit is contained in:
Hondacrx
2025-12-16 14:03:14 -05:00
parent 7b0016d508
commit 7ba62b6ef1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/MovementHandler.cs
+5 -3
View File
@@ -488,20 +488,22 @@ namespace Game
uint old_zone = plMover.GetZoneId(); uint old_zone = plMover.GetZoneId();
var dest = plMover.GetTeleportDest(); var dest = plMover.GetTeleportDest();
WorldLocation destLocation = new(dest.Location);
dest.Location.GetPosition(out float x, out float y, out float z, out float o);
if (dest.TransportGuid.HasValue) if (dest.TransportGuid.HasValue)
{ {
Transport transport = plMover.GetMap().GetTransport(dest.TransportGuid.Value); Transport transport = plMover.GetMap().GetTransport(dest.TransportGuid.Value);
if (transport != null) if (transport != null)
{ {
transport.AddPassenger(plMover); transport.AddPassenger(plMover);
plMover.m_movementInfo.transport.pos.Relocate(dest.Location.GetPosition()); plMover.m_movementInfo.transport.pos.Relocate(destLocation);
dest.Location.GetPosition(out float x, out float y, out float z, out float o);
transport.CalculatePassengerPosition(ref x, ref y, ref z, ref o); transport.CalculatePassengerPosition(ref x, ref y, ref z, ref o);
destLocation.Relocate(x, y, z, o);
} }
} }
plMover.UpdatePosition(dest.Location, true); plMover.UpdatePosition(destLocation, true);
plMover.SetFallInformation(0, GetPlayer().GetPositionZ()); plMover.SetFallInformation(0, GetPlayer().GetPositionZ());
uint newzone, newarea; uint newzone, newarea;