juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Freezing on throwing jetpack (#30223)

Browse Source 
* Fix Freezing on throwing jetpack

* bweep(requested stuff)
This commit is contained in:
Cojoke
2024-07-22 17:24:26 -05:00
committed by GitHub
parent 6bd1604194
commit e039e92016
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
View File

@@ -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);