From 83901cafc5722a2e89092817dbd9beddff5a680f Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Tue, 30 Jan 2024 18:10:57 -0800
Subject: [PATCH] Fix ClimbSystem removing the climbing fixture when it still
 has contacts (#24756)

---
 Content.Shared/Climbing/Systems/ClimbSystem.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index c54149243a..23bc54b8f8 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -1,4 +1,3 @@
-using System.Numerics;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
@@ -13,7 +12,6 @@ using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Movement.Events;
-using Content.Shared.Movement.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
@@ -353,7 +351,8 @@ public sealed partial class ClimbSystem : VirtualController
     {
         if (args.OurFixtureId != ClimbingFixtureName
             || !component.IsClimbing
-            || component.NextTransition != null)
+            || component.NextTransition != null
+            || args.OurFixture.Contacts.Count > 1)
         {
             return;
         }
-- 
2.52.0