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/Player/Player.DB.cs
+6 -4
View File
@@ -3429,8 +3429,9 @@ namespace Game.Entities
stmt.AddValue(index++, finiteAlways(GetTransOffsetZ()));
stmt.AddValue(index++, finiteAlways(GetTransOffsetO()));
ulong transLowGUID = 0;
if (GetTransport())
transLowGUID = GetTransport().GetGUID().GetCounter();
Transport transport = GetTransport<Transport>();
if (transport != null)
transLowGUID = transport.GetGUID().GetCounter();
stmt.AddValue(index++, transLowGUID);
StringBuilder ss = new();
@@ -3570,8 +3571,9 @@ namespace Game.Entities
stmt.AddValue(index++, finiteAlways(GetTransOffsetZ()));
stmt.AddValue(index++, finiteAlways(GetTransOffsetO()));
ulong transLowGUID = 0;
if (GetTransport())
transLowGUID = GetTransport().GetGUID().GetCounter();
Transport transport = GetTransport<Transport>();
if (transport != null)
transLowGUID = transport.GetGUID().GetCounter();
stmt.AddValue(index++, transLowGUID);
StringBuilder ss = new();
Source/Game/Entities/Player/Player.Map.cs
+1 -1
View File
@@ -803,7 +803,7 @@ namespace Game.Entities
m_MirrorTimerFlags |= PlayerUnderwaterState.InWater;
// Fatigue bar state (if not on flight path or transport)
if (newLiquidData.type_flags.HasAnyFlag(LiquidHeaderTypeFlags.DarkWater) && !IsInFlight() && !GetTransport())
if (newLiquidData.type_flags.HasAnyFlag(LiquidHeaderTypeFlags.DarkWater) && !IsInFlight() && GetTransport() == null)
m_MirrorTimerFlags |= PlayerUnderwaterState.InDarkWater;
// Lava state (any contact)
Source/Game/Entities/Player/Player.cs
+7 -15
View File
@@ -1686,8 +1686,8 @@ namespace Game.Entities
{
Log.outDebug(LogFilter.Maps, "Player {0} using client without required expansion tried teleport to non accessible map {1}", GetName(), mapid);
Transport _transport = GetTransport();
if (_transport)
ITransport _transport = GetTransport();
if (_transport != null)
{
_transport.RemovePassenger(this);
RepopAtGraveyard(); // teleport to near graveyard if on transport, looks blizz like :)
@@ -1708,8 +1708,8 @@ namespace Game.Entities
DisableSpline();
GetMotionMaster().Remove(MovementGeneratorType.Effect);
Transport transport = GetTransport();
if (transport)
ITransport transport = GetTransport();
if (transport != null)
{
if (!options.HasAnyFlag(TeleportToOptions.NotLeaveTransport))
transport.RemovePassenger(this);
@@ -1849,11 +1849,11 @@ namespace Game.Entities
transferPending.MapID = (int)mapid;
transferPending.OldMapPosition = GetPosition();
transport = GetTransport();
if (transport)
Transport transport1 = (Transport)GetTransport();
if (transport1 != null)
{
TransferPending.ShipTransferPending shipTransferPending = new();
shipTransferPending.Id = transport.GetEntry();
shipTransferPending.Id = transport1.GetEntry();
shipTransferPending.OriginMapID = (int)GetMapId();
transferPending.Ship = shipTransferPending;
}
@@ -6242,14 +6242,6 @@ namespace Game.Entities
{
switch (target.GetTypeId())
{
case TypeId.GameObject:
// @HACK: This is to prevent objects like deeprun tram from disappearing when player moves far from its spawn point while riding it
// But exclude stoppable elevators from this hack - they would be teleporting from one end to another
// if affected transports move so far horizontally that it causes them to run out of visibility range then you are out of luck
// fix visibility instead of adding hacks here
if (!target.ToGameObject().IsDynTransport())
s64.Add(target.GetGUID());
break;
case TypeId.Unit:
s64.Add(target.GetGUID());
v.Add(target.ToCreature());