From ca40c0fce2c8e3030df4e0d6e529e0e49c5eae95 Mon Sep 17 00:00:00 2001
From: keronshb <54602815+keronshb@users.noreply.github.com>
Date: Fri, 30 Dec 2022 12:22:06 -0500
Subject: [PATCH] Checks if a buckled entity is terminating before reparent
 (#13202)

---
 Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs b/Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs
index 5cc39d3178..87b995d7fa 100644
--- a/Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs
+++ b/Content.Server/Buckle/Systems/BuckleSystem.Buckle.cs
@@ -338,7 +338,7 @@ public sealed partial class BuckleSystem
         var xform = Transform(buckleId);
         var oldBuckledXform = Transform(oldBuckledTo.Owner);
 
-        if (xform.ParentUid == oldBuckledXform.Owner)
+        if (xform.ParentUid == oldBuckledXform.Owner && !Terminating(xform.ParentUid))
         {
             _containers.AttachParentToContainerOrGrid(xform);
             xform.WorldRotation = oldBuckledXform.WorldRotation;