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

Add more interaction checks

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-07 01:40:08 +02:00
parent 2fd93091c7
commit e0f888344e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,9 +262,17 @@ namespace Content.Server.GameObjects.EntitySystems.Click
}
}
if (!ActionBlockerSystem.CanInteract(player) ||
ContainerHelpers.TryGetContainer(player, out var container) &&
container.Owner != attacked)
if (!ActionBlockerSystem.CanInteract(player))
{
return;
}
// In a container where the attacked entity is not the container's owner and either the attacked entity is null, not contained or in a different container
if (ContainerHelpers.TryGetContainer(player, out var playerContainer) &&
attacked != playerContainer.Owner &&
(attacked == null ||
!ContainerHelpers.TryGetContainer(attacked, out var attackedContainer) ||
attackedContainer != playerContainer))
{
return;
}