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

Make combat check CanInteract (#7046)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-09 19:40:07 +13:00
committed by GitHub
parent d691161542
commit 17132385d4
8 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Stunnable/SharedStunSystem.cs
View File

@@ -54,7 +54,6 @@ namespace Content.Shared.Stunnable
SubscribeLocalEvent<StunnedComponent, ThrowAttemptEvent>(OnThrowAttempt);
SubscribeLocalEvent<StunnedComponent, DropAttemptEvent>(OnDropAttempt);
SubscribeLocalEvent<StunnedComponent, PickupAttemptEvent>(OnPickupAttempt);
SubscribeLocalEvent<StunnedComponent, AttackAttemptEvent>(OnAttackAttempt);
SubscribeLocalEvent<StunnedComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
SubscribeLocalEvent<StunnedComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
}
@@ -236,11 +235,6 @@ namespace Content.Shared.Stunnable
args.Cancel();
}
private void OnAttackAttempt(EntityUid uid, StunnedComponent stunned, AttackAttemptEvent args)
{
args.Cancel();
}
private void OnEquipAttempt(EntityUid uid, StunnedComponent stunned, IsEquippingAttemptEvent args)
{
// is this a self-equip, or are they being stripped?