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

Core/Players: Allow targeting a specific transport during teleports

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/5b130cfb4253a94c08ff807e7f28e988651d2476)
This commit is contained in:
Hondacrx
2024-08-25 14:38:47 -04:00
parent cbb6c97a6e
commit 2004acd5d1
6 changed files with 130 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Transport.cs
+3 -4
View File
@@ -643,7 +643,7 @@ namespace Game.Entities
if (oldMapId != newMapId)
{
UnloadStaticPassengers();
TeleportPassengersAndHideTransport(newMapId, x, y, z, o);
TeleportPassengersAndHideTransport(newMapId);
return true;
}
else
@@ -673,7 +673,7 @@ namespace Game.Entities
}
}
void TeleportPassengersAndHideTransport(uint newMapid, float x, float y, float z, float o)
void TeleportPassengersAndHideTransport(uint newMapid)
{
if (newMapid == GetMapId())
{
@@ -714,12 +714,11 @@ namespace Game.Entities
{
float destX, destY, destZ, destO;
obj.m_movementInfo.transport.pos.GetPosition(out destX, out destY, out destZ, out destO);
ITransport.CalculatePassengerPosition(ref destX, ref destY, ref destZ, ref destO, x, y, z, o);
switch (obj.GetTypeId())
{
case TypeId.Player:
if (!obj.ToPlayer().TeleportTo(newMapid, destX, destY, destZ, destO, TeleportToOptions.NotLeaveTransport))
if (!obj.ToPlayer().TeleportTo(new TeleportLocation() { Location = new WorldLocation(newMapid, destX, destY, destZ, destO), TransportGuid = GetTransGUID() }, TeleportToOptions.NotLeaveTransport))
RemovePassenger(obj);
break;
case TypeId.DynamicObject: