From 841d07c622366a829e238ca2d45dec82dde3f58e Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 1 Jun 2021 23:42:54 +1000
Subject: [PATCH] Fix buckle test (#4117)

AFAICT there's a directed event getting raised in TryUnbuckle from the parent change which then tries to GetComponent buckle which doesn't work.
---
 .../GameObjects/Components/Buckle/BuckleComponent.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
index 56e4c0b706..9e54d842f3 100644
--- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
+++ b/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
@@ -390,13 +390,13 @@ namespace Content.Server.GameObjects.Components.Buckle
 
         public override void OnRemove()
         {
-            base.OnRemove();
-
             BuckledTo?.Remove(this);
             TryUnbuckle(Owner, true);
 
             _buckleTime = default;
             UpdateBuckleStatus();
+
+            base.OnRemove();
         }
 
         public override ComponentState GetComponentState(ICommonSession player)