From 1d98152953f081f57cde8bbeb91fc8a228998f9b Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 26 Jan 2020 16:17:07 +0100
Subject: [PATCH] Fix grabbing things out of storage items doing an attack
 sometimes.

---
 Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
index 5f8d4a25df..92cdf16b3c 100644
--- a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
@@ -101,7 +101,7 @@ namespace Content.Client.GameObjects.EntitySystems
             }
 
             // Up.
-            if (_timeHeld >= AttackTimeThreshold)
+            if (UseOrAttackIsDown && _timeHeld >= AttackTimeThreshold)
             {
                 // Attack.
                 SendMsg(ContentKeyFunctions.Attack, BoundKeyState.Down);