From facb0358f5f02af4b5c95f6b55b8babde20d8289 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Fri, 1 Oct 2021 13:15:30 +0200
Subject: [PATCH] Fix buckle component exception when Removed from entity.

---
 Content.Server/Buckle/Components/BuckleComponent.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs
index d6a57fc116..f1472abd36 100644
--- a/Content.Server/Buckle/Components/BuckleComponent.cs
+++ b/Content.Server/Buckle/Components/BuckleComponent.cs
@@ -334,7 +334,7 @@ namespace Content.Server.Buckle.Components
 
             Appearance?.SetData(BuckleVisuals.Buckled, false);
 
-            if (_stunnable != null && _stunnable.KnockedDown
+            if (_stunnable is { KnockedDown: true }
                 || (_mobState?.IsIncapacitated() ?? false))
             {
                 EntitySystem.Get<StandingStateSystem>().Down(Owner);
@@ -386,7 +386,7 @@ namespace Content.Server.Buckle.Components
             UpdateBuckleStatus();
         }
 
-        protected override void OnRemove()
+        protected override void Shutdown()
         {
             BuckledTo?.Remove(this);
             TryUnbuckle(Owner, true);
@@ -394,7 +394,7 @@ namespace Content.Server.Buckle.Components
             _buckleTime = default;
             UpdateBuckleStatus();
 
-            base.OnRemove();
+            base.Shutdown();
         }
 
         public override ComponentState GetComponentState(ICommonSession player)