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

Add CanAttack to IActionBlocker, prevent using guns when dead (#769)

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-03-03 15:10:09 +01:00
committed by GitHub
parent 5e2cac78ac
commit d1ff84e95d
5 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs
View File

@@ -1,5 +1,6 @@
using System;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Weapons.Ranged;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
@@ -30,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
private bool UserCanFire(IEntity user)
{
return UserCanFireHandler == null || UserCanFireHandler(user);
return (UserCanFireHandler == null || UserCanFireHandler(user)) && ActionBlockerSystem.CanAttack(user);
}
private void Fire(IEntity user, GridCoordinates clickLocation)