Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Lag compensation for melee (#11885)

Browse Source 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-10-17 15:54:31 +11:00
committed by GitHub
parent ece9bf372a
commit 123a9dbf02
12 changed files with 242 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
View File

@@ -16,6 +16,7 @@ using Robust.Shared.Animations;
using Robust.Shared.Input;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
@@ -205,9 +206,9 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
}
}
protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, MeleeWeaponComponent component)
protected override bool DoDisarm(EntityUid user, DisarmAttackEvent ev, MeleeWeaponComponent component, ICommonSession? session)
{
if (!base.DoDisarm(user, ev, component))
if (!base.DoDisarm(user, ev, component, session))
return false;
if (!TryComp<CombatModeComponent>(user, out var combatMode) ||