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

Core/GameObjects: Transport (type 11) improvements

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/630b60eb0dcd3d9ce41582664ab822b049365431)
This commit is contained in:
hondacrx
2022-06-03 16:20:41 -04:00
parent e65ce31742
commit 40444525b2
30 changed files with 807 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Vehicle.cs
+18 -6
View File
@@ -291,7 +291,7 @@ namespace Game.Entities
// @VehicleJoinEvent.Abort
}
public bool AddPassenger(Unit unit, sbyte seatId)
public bool AddVehiclePassenger(Unit unit, sbyte seatId)
{
// @Prevent adding passengers when vehicle is uninstalling. (Bad script in OnUninstall/OnRemovePassenger/PassengerBoarded hook.)
if (_status == Status.UnInstalling)
@@ -355,8 +355,12 @@ namespace Game.Entities
return true;
}
public Vehicle RemovePassenger(Unit unit)
public ITransport RemovePassenger(WorldObject passenger)
{
Unit unit = passenger.ToUnit();
if (unit == null)
return null;
if (unit.GetVehicle() != this)
return null;
@@ -421,8 +425,8 @@ namespace Game.Entities
}
}
foreach (var pair in seatRelocation)
pair.Item1.UpdatePosition(pair.Item2);
foreach (var (passenger, position) in seatRelocation)
ITransport.UpdatePassengerPosition(this, _me.GetMap(), passenger, position.GetPositionX(), position.GetPositionY(), position.GetPositionZ(), position.GetOrientation(), false);
}
public bool IsVehicleInUse()
@@ -487,20 +491,28 @@ namespace Game.Entities
return ret;
}
public ObjectGuid GetTransportGUID() { return GetBase().GetGUID(); }
public float GetTransportOrientation() { return GetBase().GetOrientation(); }
public void AddPassenger(WorldObject passenger) { Log.outFatal(LogFilter.Vehicle, "Vehicle cannot directly gain passengers without auras"); }
public void CalculatePassengerPosition(ref float x, ref float y, ref float z, ref float o)
{
TransportPosHelper.CalculatePassengerPosition(ref x, ref y, ref z, ref o,
ITransport.CalculatePassengerPosition(ref x, ref y, ref z, ref o,
GetBase().GetPositionX(), GetBase().GetPositionY(),
GetBase().GetPositionZ(), GetBase().GetOrientation());
}
public void CalculatePassengerOffset(ref float x, ref float y, ref float z, ref float o)
{
TransportPosHelper.CalculatePassengerOffset(ref x, ref y, ref z, ref o,
ITransport.CalculatePassengerOffset(ref x, ref y, ref z, ref o,
GetBase().GetPositionX(), GetBase().GetPositionY(),
GetBase().GetPositionZ(), GetBase().GetOrientation());
}
public int GetMapIdForSpawning() { return (int)GetBase().GetMapId(); }
public void RemovePendingEvent(VehicleJoinEvent e)
{
foreach (var Event in _pendingJoinEvents)