tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ClimbSystem removing the climbing fixture when it still has contacts (#24756)

Browse Source
This commit is contained in:
DrSmugleaf
2024-01-30 18:10:57 -08:00
committed by GitHub
parent 4e4fa11f58
commit 83901cafc5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Climbing/Systems/ClimbSystem.cs
View File

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