From b11c8d4df878143f91b270e12ab7049630f0fed0 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 2 Apr 2023 07:49:26 +1200
Subject: [PATCH] More predicted virtual item fixes (#15049)

---
 Content.Shared/Hands/SharedHandVirtualItemSystem.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Hands/SharedHandVirtualItemSystem.cs b/Content.Shared/Hands/SharedHandVirtualItemSystem.cs
index 037b36d4a8..f93d729298 100644
--- a/Content.Shared/Hands/SharedHandVirtualItemSystem.cs
+++ b/Content.Shared/Hands/SharedHandVirtualItemSystem.cs
@@ -27,7 +27,7 @@ public abstract class SharedHandVirtualItemSystem : EntitySystem
 
     public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem)
     {
-        if (!_hands.TryGetEmptyHand(user, out var hand))
+        if (_net.IsClient || !_hands.TryGetEmptyHand(user, out var hand))
         {
             virtualItem = null;
             return false;
@@ -81,6 +81,9 @@ public abstract class SharedHandVirtualItemSystem : EntitySystem
     /// </summary>
     public void Delete(HandVirtualItemComponent comp, EntityUid user)
     {
+        if (_net.IsClient)
+            return;
+
         var userEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user);
         RaiseLocalEvent(user, userEv);
         var targEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user);
-- 
2.51.2