Fix interact using sometimes having target==used (#6847)

2022-02-23 17:58:06 +13:00
parent d16b019dd3
commit de8dcb75bf
2 changed files with 12 additions and 0 deletions
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -216,6 +216,12 @@ namespace Content.Shared.Interaction
            if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user))
                return;

+            if (target == hand.HeldEntity)
+            {
+                UseInHandInteraction(user, target.Value, checkCanUse: false, checkCanInteract: false);
+                return;
+            }
+
            if (inRangeUnobstructed && target != null)
            {
                InteractUsing(