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

Fix DoDrop to DropNextTo in container cases (#30911)

Browse Source 
* Fix DoDrop to DropNextTo in container cases
DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method

* codestyle change
This commit is contained in:
Token
2024-08-12 19:18:26 +05:00
committed by GitHub
parent 691e37c0db
commit d4c0155d66
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,13 +126,21 @@ public abstract partial class SharedHandsSystem
var userXform = Transform(uid); var userXform = Transform(uid);
var isInContainer = ContainerSystem.IsEntityOrParentInContainer(uid, xform: userXform); var isInContainer = ContainerSystem.IsEntityOrParentInContainer(uid, xform: userXform);
// if the user is in a container, drop the item inside the container
if (isInContainer) {
TransformSystem.DropNextTo((entity, itemXform), (uid, userXform));
return true;
}
// drop the item with heavy calculations from their hands and place it at the calculated interaction range position
// The DoDrop is handle if there's no drop target
DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp); DoDrop(uid, hand, doDropInteraction: doDropInteraction, handsComp);
// drop the item inside the container if the user is in a container // if there's no drop location stop here
if (targetDropLocation == null || isInContainer) if (targetDropLocation == null)
return true; return true;
// otherwise, remove the item from their hands and place it at the calculated interaction range position // otherwise, also move dropped item and rotate it properly according to grid/map
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);