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

Reduce action blocker uses and add target entity to CanInteract (#6655)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-15 17:06:52 +13:00
committed by GitHub
parent 334568dad2
commit ad9ddf1552
60 changed files with 286 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs
View File

@@ -44,9 +44,6 @@ namespace Content.Server.Weapon.Melee.EnergySword
{
if (args.Handled) return;
if (!_blockerSystem.CanUse(args.User))
return;
args.Handled = true;
if (comp.Activated)
@@ -114,7 +111,7 @@ namespace Content.Server.Weapon.Melee.EnergySword
{
if (args.Handled) return;
if (comp.Hacked || !_blockerSystem.CanInteract(args.User))
if (comp.Hacked)
return;
if (!TryComp(args.Used, out ToolComponent? tool) || !tool.Qualities.ContainsAny("Pulsing")) return;

2
Content.Server/Weapon/Ranged/GunSystem.Guns.cs
View File

@@ -40,7 +40,7 @@ public sealed partial class GunSystem
if (!TryComp(user, out CombatModeComponent? combat) ||
!combat.IsInCombatMode ||
!_blocker.CanInteract(user)) return;
!_blocker.CanInteract(user, gun.Owner)) return;
var fireAttempt = new GunFireAttemptEvent(user, gun);
EntityManager.EventBus.RaiseLocalEvent(gun.Owner, fireAttempt);