Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clamp out of range item drops (#631)

Browse Source
This commit is contained in:
Markus W. Halvorsen
2020-02-08 15:32:21 +01:00
committed by GitHub
parent d1c5cf9607
commit 595ffb3237
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/EntitySystems/HandsSystem.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.Components.Stack;
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
@@ -130,7 +130,11 @@ namespace Content.Server.GameObjects.EntitySystems
} }
else else
{ {
handsComp.Drop(handsComp.ActiveIndex); var entCoords = ent.Transform.GridPosition.Position;
var entToDesiredDropCoords = coords.Position - entCoords;
var clampedDropCoords = ((entToDesiredDropCoords.Normalized * InteractionSystem.InteractionRange) + entCoords);
handsComp.Drop(handsComp.ActiveIndex, new GridCoordinates(clampedDropCoords, coords.GridID));
} }
return true; return true;