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

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

Browse Source
This commit is contained in:
Ephememory
2019-11-10 04:59:26 -05:00
committed by Pieter-Jan Briers
parent 51359cf77b
commit 7032c8a92e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
using System; using System;
using Content.Server.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged;
using Robust.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -66,6 +67,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged
return; return;
} }
if(!user.TryGetComponent(out CombatModeComponent combat) || !combat.IsInCombatMode) {
return;
}
if (!UserCanFire(user) || !WeaponCanFire()) if (!UserCanFire(user) || !WeaponCanFire())
{ {
return; return;