diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index c960b8e619..6f6672e951 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -355,13 +355,14 @@ public sealed partial class ClimbSystem : VirtualController return; } - foreach (var fixture in args.OurFixture.Contacts.Keys) + foreach (var otherFixture in args.OurFixture.Contacts.Keys) { - if (fixture == args.OtherFixture) + // If it's the other fixture then ignore em + if (otherFixture == args.OtherFixture) continue; // If still colliding with a climbable, do not stop climbing - if (HasComp(args.OtherEntity)) + if (HasComp(otherFixture.Owner)) return; }