From 8b5b0e24bcaa6c5cc9229c17eb138cdb476f0c9e Mon Sep 17 00:00:00 2001 From: Brandon H Date: Mon, 29 Jul 2024 16:04:48 -0500 Subject: [PATCH] ugh --- .../GameObjects/Components/ActionBlocking/HandCuffTest.cs | 2 ++ Content.Shared/Cuffs/SharedCuffableSystem.cs | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs index 2570e2246a66..118d86e4984c 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs @@ -1,3 +1,4 @@ +/* #nullable enable using Content.Server.Cuffs; using Content.Shared.Body.Components; @@ -106,3 +107,4 @@ private static void AddHand(NetEntity to, IServerConsoleHost host) } } } +*/ diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index b9f287f1ce45..fa6fd518848b 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -461,8 +461,9 @@ public bool TryAddNewCuffs(EntityUid target, EntityUid user, EntityUid handcuff, if (!_interaction.InRangeUnobstructed(handcuff, target)) return false; - // Success! - _hands.TryDrop(user, handcuff); + // Success? + if(!_hands.TryDrop(user, handcuff)) + return false; _container.Insert(handcuff, component.Container); UpdateHeldItems(target, handcuff, component);