]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix ClimbSystem removing the climbing fixture when it still has contacts (#24756)
authorDrSmugleaf <DrSmugleaf@users.noreply.github.com>
Wed, 31 Jan 2024 02:10:57 +0000 (18:10 -0800)
committerGitHub <noreply@github.com>
Wed, 31 Jan 2024 02:10:57 +0000 (13:10 +1100)
Content.Shared/Climbing/Systems/ClimbSystem.cs

index c54149243a48d00b2f68097c5f31d0fdbb58f215..23bc54b8f894dd87969348025b77ed730b06d0eb 100644 (file)
@@ -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;
         }