From 3da31d5146217cda89650c7bceff45d09c5f2e6a Mon Sep 17 00:00:00 2001 From: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Date: Sun, 21 Nov 2021 01:06:44 -0400 Subject: [PATCH] Fixes ActivateItemInWorld working with things outside your container (#5424) * Fixes InteractionActivate working inside containers * This makes more sense now that i think about it --- Content.Server/Interaction/InteractionSystem.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs index be13f7e538..5c304801b3 100644 --- a/Content.Server/Interaction/InteractionSystem.cs +++ b/Content.Server/Interaction/InteractionSystem.cs @@ -184,6 +184,9 @@ namespace Content.Server.Interaction if (!EntityManager.TryGetEntity(uid, out var used)) return false; + if (user.IsInContainer()) + return false; + InteractionActivate(user, used); return true; }