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

fixes trashbag picking up things through walls

Browse Source 
fixes #5098
This commit is contained in:
Paul
2021-10-31 14:23:26 +01:00
parent 066d1e60a3
commit 0bbc4d9afe
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Storage/Components/ServerStorageComponent.cs
View File

@@ -5,8 +5,8 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Server.DoAfter; using Content.Server.DoAfter;
using Content.Server.Hands.Components; using Content.Server.Hands.Components;
using Content.Server.Interaction;
using Content.Server.Items; using Content.Server.Items;
using Content.Shared.ActionBlocker;
using Content.Shared.Acts; using Content.Shared.Acts;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Interaction.Helpers; using Content.Shared.Interaction.Helpers;
@@ -15,7 +15,6 @@ using Content.Shared.Placeable;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.Sound; using Content.Shared.Sound;
using Content.Shared.Storage; using Content.Shared.Storage;
using Content.Shared.Verbs;
using Content.Shared.Whitelist; using Content.Shared.Whitelist;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.Player; using Robust.Server.Player;
@@ -24,7 +23,6 @@ using Robust.Shared.Containers;
using Robust.Shared.Enums; using Robust.Shared.Enums;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Network; using Robust.Shared.Network;
@@ -530,7 +528,8 @@ namespace Content.Server.Storage.Components
{ {
if (entity.IsInContainer() if (entity.IsInContainer()
|| entity == eventArgs.User || entity == eventArgs.User
|| !entity.HasComponent<SharedItemComponent>()) || !entity.HasComponent<SharedItemComponent>()
|| !EntitySystem.Get<InteractionSystem>().InRangeUnobstructed(eventArgs.User, entity))
continue; continue;
validStorables.Add(entity); validStorables.Add(entity);
} }