From 7e3b9fb2fe14cc25fca40abf2acff80af7857b5c Mon Sep 17 00:00:00 2001
From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Sun, 18 Aug 2024 19:42:22 -0700
Subject: [PATCH] Allow a specific hand to be passed into
 TrySpawnVirtualItemInHand (#31124)

---
 .../Inventory/VirtualItem/SharedVirtualItemSystem.cs         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
index 8b9c052c8d..8e62c5163d 100644
--- a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
+++ b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -94,10 +95,10 @@ public abstract class SharedVirtualItemSystem : EntitySystem
     }
 
     /// <inheritdoc cref="TrySpawnVirtualItemInHand(Robust.Shared.GameObjects.EntityUid,Robust.Shared.GameObjects.EntityUid,bool)"/>
-    public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem, bool dropOthers = false)
+    public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem, bool dropOthers = false, Hand? empty = null)
     {
         virtualItem = null;
-        if (!_handsSystem.TryGetEmptyHand(user, out var empty))
+        if (empty == null && !_handsSystem.TryGetEmptyHand(user, out empty))
         {
             if (!dropOthers)
                 return false;