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

Replace InEntityStorageComponent with in container check

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-07 01:00:29 +02:00
parent 0a292634be
commit 5901e6e45f
3 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -13,6 +13,7 @@ using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Input;
@@ -261,7 +262,8 @@ namespace Content.Server.GameObjects.EntitySystems.Click
}
}
if (!ActionBlockerSystem.CanInteract(player))
if (!ActionBlockerSystem.CanInteract(player) ||
ContainerHelpers.IsInContainer(player))
{
return;
}