juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions 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;
}
}

24
Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
View File

@@ -25,6 +25,7 @@ using Content.Shared.Weapons.Melee.Events;
using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Player;
using Robust.Shared.Players;
using Robust.Shared.Random;
@@ -85,6 +86,29 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
args.Verbs.Add(verb);
}
protected override bool ArcRaySuccessful(EntityUid targetUid, Vector2 position, Angle angle, Angle arcWidth, float range, MapId mapId,
EntityUid ignore, ICommonSession? session)
{
// Originally the client didn't predict damage effects so you'd intuit some level of how far
// in the future you'd need to predict, but then there was a lot of complaining like "why would you add artifical delay" as if ping is a choice.
// Now damage effects are predicted but for wide attacks it differs significantly from client and server so your game could be lying to you on hits.
// This isn't fair in the slightest because it makes ping a huge advantage and this would be a hidden system.
// Now the client tells us what they hit and we validate if it's plausible.
// Even if the client is sending entities they shouldn't be able to hit:
// A) Wide-damage is split anyway
// B) We run the same validation we do for click attacks.
// Could also check the arc though future effort + if they're aimbotting it's not really going to make a difference.
// (This runs lagcomp internally and is what clickattacks use)
if (!Interaction.InRangeUnobstructed(ignore, targetUid, range + 0.1f))
return false;
// TODO: Check arc though due to the aforementioned aimbot + damage split comments it's less important.
return true;
}
private DamageSpecifier? GetDamage(MeleeWeaponComponent component)
{
return component.Damage.Total > FixedPoint2.Zero ? component.Damage : null;