From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Mon, 22 Jul 2024 22:24:26 +0000 (-0500)
Subject: Fix Freezing on throwing jetpack (#30223)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e039e92016f34364a8779139615fa91702e024a4;p=space-station-14.git

Fix Freezing on throwing jetpack (#30223)

* Fix Freezing on throwing jetpack

* bweep(requested stuff)
---

diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
index 2e3c6f6203..0579e99725 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
@@ -3,6 +3,7 @@ using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.VirtualItem;
 using Content.Shared.Tag;
+using Content.Shared.Interaction.Events;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 
@@ -125,15 +126,13 @@ public abstract partial class SharedHandsSystem
         var userXform = Transform(uid);
         var isInContainer = ContainerSystem.IsEntityOrParentInContainer(uid, xform: userXform);
 
+        DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp);
+
         // drop the item inside the container if the user is in a container
         if (targetDropLocation == null || isInContainer)
-        {
-            TransformSystem.DropNextTo((entity, itemXform), (uid, userXform));
             return true;
-        }
 
         // otherwise, remove the item from their hands and place it at the calculated interaction range position
-        DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp);
         var (itemPos, itemRot) = TransformSystem.GetWorldPositionRotation(entity);
         var origin = new MapCoordinates(itemPos, itemXform.MapID);
         var target = TransformSystem.ToMapCoordinates(targetDropLocation.Value);