Fix handcuffed entity deletion and a mind shutdown error. (#21825)

* Fix handcuffed deletion error * Fix mind shutdown error
2023-11-22 13:53:30 +13:00
parent 358de9b7df
commit aa59956134
2 changed files with 4 additions and 1 deletions
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -619,6 +619,9 @@ namespace Content.Shared.Cuffs
            if (!Resolve(target, ref cuffable) || !Resolve(cuffsToRemove, ref cuff))
                return;

+            if (TerminatingOrDeleted(cuffsToRemove) || TerminatingOrDeleted(target))
+                return;
+
            if (user != null)
            {
                var attempt = new UncuffAttemptEvent(user.Value, target);