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

Fix item dropping (#4259)

Browse Source 
* Fix item dropping

* More optimal dropping
This commit is contained in:
metalgearsloth
2021-07-13 18:21:09 +10:00
committed by GitHub
parent 65daba185e
commit 274fb4c6d2
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/Hands/Components/SharedHandsComponent.cs
View File

@@ -441,14 +441,24 @@ namespace Content.Shared.Hands.Components
var origin = Owner.Transform.MapPosition; var origin = Owner.Transform.MapPosition;
var other = targetCoords.ToMap(Owner.EntityManager); var other = targetCoords.ToMap(Owner.EntityManager);
var dropVector = other.Position - origin.Position;
var requestedDropDistance = (dropVector.Length);
if (dropVector.Length > SharedInteractionSystem.InteractionRange)
{
dropVector = dropVector.Normalized * SharedInteractionSystem.InteractionRange;
other = new MapCoordinates(origin.Position + dropVector, other.MapId);
}
var dropLength = EntitySystem.Get<SharedInteractionSystem>().UnobstructedDistance(origin, other, ignoredEnt: Owner); var dropLength = EntitySystem.Get<SharedInteractionSystem>().UnobstructedDistance(origin, other, ignoredEnt: Owner);
dropLength = MathF.Min(dropLength, SharedInteractionSystem.InteractionRange);
var dropVector = origin.Position; var diff = requestedDropDistance - dropLength;
if (dropLength != 0)
dropVector += (other.Position - origin.Position).Normalized * dropLength;
return targetCoords.WithPosition(dropVector); // If we come up short then offset the drop location.
if (diff > 0)
return targetCoords.Offset(-dropVector.Normalized * diff);
return targetCoords;
} }
/// <summary> /// <summary>