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

Fix being able to pull entities outside of your container (#1533)

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-29 13:32:02 +02:00
committed by GitHub
parent 3cd5d7ba3b
commit e0f429c59b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/GameObjects/Components/GUI/HandsComponent.cs
View File

@@ -502,6 +502,17 @@ namespace Content.Server.GameObjects.Components.GUI
return;
}
var isOwnerContained = ContainerHelpers.TryGetContainer(Owner, out var ownerContainer);
var isPullableContained = ContainerHelpers.TryGetContainer(pullable.Owner, out var pullableContainer);
if (isOwnerContained || isPullableContained)
{
if (ownerContainer != pullableContainer)
{
return;
}
}
if (IsPulling)
{
StopPull();