From 39b650da386eaa79db7dc569e3bcf7a0571b77a3 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Wed, 8 Jul 2020 13:01:08 +0200
Subject: [PATCH] Fix "You're already buckled in" not appearing if trying to
 buckle while already buckled

---
 .../GameObjects/Components/Mobs/BuckleComponent.cs   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs b/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs
index 98f9da38f2..c2e08e975a 100644
--- a/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs
+++ b/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs
@@ -246,18 +246,12 @@ namespace Content.Server.GameObjects.Components.Mobs
 
         public bool ToggleBuckle(IEntity user, IEntity to)
         {
-            if (BuckledTo == null)
-            {
-                return TryBuckle(user, to);
-            }
-            else if (BuckledTo.Owner == to)
+            if (BuckledTo?.Owner == to)
             {
                 return TryUnbuckle(user);
             }
-            else
-            {
-                return false;
-            }
+
+            return TryBuckle(user, to);
         }
 
         public override void ExposeData(ObjectSerializer serializer)