no use in pocket (#17785)

2023-07-03 14:36:59 -07:00
parent e9665f2a44
commit 48f29cbbf7
1 changed files with 7 additions and 0 deletions
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -161,6 +161,13 @@ public sealed partial class BlockingSystem : EntitySystem
                return false;
            }

+            // Don't allow someone to block if they're not holding the shield
+            if(!_handsSystem.IsHolding(user, item, out _))
+            {
+                CantBlockError(user);
+                return false;
+            }
+
            //Don't allow someone to block if someone else is on the same tile
            var playerTileRef = xform.Coordinates.GetTileRef();
            if (playerTileRef != null)