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)