Checks if user is in combat mode before allowing firing. (#425)

2019-11-10 04:59:26 -05:00
parent 51359cf77b
commit 7032c8a92e
1 changed files with 5 additions and 0 deletions
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs
+++ b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs
@@ -1,4 +1,5 @@
 using System;
+using Content.Server.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Weapons.Ranged;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
@@ -66,6 +67,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
                return;
            }

+            if(!user.TryGetComponent(out CombatModeComponent combat) || !combat.IsInCombatMode) {
+                return;
+            }
+
            if (!UserCanFire(user) || !WeaponCanFire())
            {
                return;