From 34e7edb5f5c0cab9b050490d9d2cbc8aa0d05e93 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Sun, 25 Aug 2019 04:10:59 -0700 Subject: [PATCH] Fix for clicking an item in the offhand with the activehand (#314) * Fix for clicking an item in the offhand with the activehand * Renamed attacked to entity --- .../GameObjects/Components/GUI/ServerHandsComponent.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs index d38b0efd48..f4a1f348be 100644 --- a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs @@ -482,7 +482,10 @@ namespace Content.Server.GameObjects } else { - interactionSystem.Interaction(Owner, slot.ContainedEntity); + var entity = slot.ContainedEntity; + if (!Drop(entity)) + break; + interactionSystem.Interaction(Owner, entity); } }