From 2fd93091c7889c4206f4eaed06721944a6306cf4 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Tue, 7 Jul 2020 01:10:21 +0200
Subject: [PATCH] Allow interaction if targeting the containing entity

---
 .../GameObjects/EntitySystems/Click/InteractionSystem.cs       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
index 10fbed594a..355e74d16a 100644
--- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
@@ -263,7 +263,8 @@ namespace Content.Server.GameObjects.EntitySystems.Click
             }
 
             if (!ActionBlockerSystem.CanInteract(player) ||
-                ContainerHelpers.IsInContainer(player))
+                ContainerHelpers.TryGetContainer(player, out var container) &&
+                container.Owner != attacked)
             {
                 return;
             }