tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lag compensation for wide attacks (#15877)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-02 05:07:17 +10:00
committed by GitHub
parent 33713c1f42
commit f917440301
5 changed files with 90 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Movement/Systems/LagCompensationSystem.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.Movement.Components;
using Robust.Server.Player;
using Robust.Shared.Map;
using Robust.Shared.Players;
using Robust.Shared.Timing;
namespace Content.Server.Movement.Systems;
@@ -64,13 +65,13 @@ public sealed class LagCompensationSystem : EntitySystem
component.Positions.Enqueue((_timing.CurTime, args.NewPosition, args.NewRotation));
}
public (EntityCoordinates Coordinates, Angle Angle) GetCoordinatesAngle(EntityUid uid, IPlayerSession pSession,
public (EntityCoordinates Coordinates, Angle Angle) GetCoordinatesAngle(EntityUid uid, ICommonSession? pSession,
TransformComponent? xform = null)
{
if (!Resolve(uid, ref xform))
return (EntityCoordinates.Invalid, Angle.Zero);
if (!TryComp<LagCompensationComponent>(uid, out var lag) || lag.Positions.Count == 0)
if (pSession == null || !TryComp<LagCompensationComponent>(uid, out var lag) || lag.Positions.Count == 0)
return (xform.Coordinates, xform.LocalRotation);
var angle = Angle.Zero;
@@ -102,15 +103,15 @@ public sealed class LagCompensationSystem : EntitySystem
return (coordinates, angle);
}
public Angle GetAngle(EntityUid uid, IPlayerSession pSession, TransformComponent? xform = null)
public Angle GetAngle(EntityUid uid, ICommonSession? session, TransformComponent? xform = null)
{
var (_, angle) = GetCoordinatesAngle(uid, pSession, xform);
var (_, angle) = GetCoordinatesAngle(uid, session, xform);
return angle;
}
public EntityCoordinates GetCoordinates(EntityUid uid, IPlayerSession pSession, TransformComponent? xform = null)
public EntityCoordinates GetCoordinates(EntityUid uid, ICommonSession? session, TransformComponent? xform = null)
{
var (coordinates, _) = GetCoordinatesAngle(uid, pSession, xform);
var (coordinates, _) = GetCoordinatesAngle(uid, session, xform);
return coordinates;
}
}