tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix collidable held entities blocking themselves while being dropped (#31119)

Browse Source
This commit is contained in:
DrSmugleaf
2024-08-18 15:24:28 -07:00
committed by GitHub
parent b4ef1e9a0f
commit 4fcbb99072
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,7 +3,6 @@ using Content.Shared.Hands.Components;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Inventory.VirtualItem; using Content.Shared.Inventory.VirtualItem;
using Content.Shared.Tag; using Content.Shared.Tag;
using Content.Shared.Interaction.Events;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -144,7 +143,7 @@ public abstract partial class SharedHandsSystem
var (itemPos, itemRot) = TransformSystem.GetWorldPositionRotation(entity); var (itemPos, itemRot) = TransformSystem.GetWorldPositionRotation(entity);
var origin = new MapCoordinates(itemPos, itemXform.MapID); var origin = new MapCoordinates(itemPos, itemXform.MapID);
var target = TransformSystem.ToMapCoordinates(targetDropLocation.Value); var target = TransformSystem.ToMapCoordinates(targetDropLocation.Value);
TransformSystem.SetWorldPositionRotation(entity, GetFinalDropCoordinates(uid, origin, target), itemRot); TransformSystem.SetWorldPositionRotation(entity, GetFinalDropCoordinates(uid, origin, target, entity), itemRot);
return true; return true;
} }
@@ -173,7 +172,7 @@ public abstract partial class SharedHandsSystem
/// <summary> /// <summary>
/// Calculates the final location a dropped item will end up at, accounting for max drop range and collision along the targeted drop path, Does a check to see if a user should bypass those checks as well. /// Calculates the final location a dropped item will end up at, accounting for max drop range and collision along the targeted drop path, Does a check to see if a user should bypass those checks as well.
/// </summary> /// </summary>
private Vector2 GetFinalDropCoordinates(EntityUid user, MapCoordinates origin, MapCoordinates target) private Vector2 GetFinalDropCoordinates(EntityUid user, MapCoordinates origin, MapCoordinates target, EntityUid held)
{ {
var dropVector = target.Position - origin.Position; var dropVector = target.Position - origin.Position;
var requestedDropDistance = dropVector.Length(); var requestedDropDistance = dropVector.Length();
@@ -187,7 +186,7 @@ public abstract partial class SharedHandsSystem
target = new MapCoordinates(origin.Position + dropVector, target.MapId); target = new MapCoordinates(origin.Position + dropVector, target.MapId);
} }
dropLength = _interactionSystem.UnobstructedDistance(origin, target, predicate: e => e == user); dropLength = _interactionSystem.UnobstructedDistance(origin, target, predicate: e => e == user || e == held);
} }
if (dropLength < requestedDropDistance) if (dropLength < requestedDropDistance)