From b08c4edd551408e518a84b340d9df72ef817f811 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 30 Nov 2023 00:23:21 +1100
Subject: [PATCH] Fix getting stuck on tables (#21981)

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

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<ClimbableComponent>(args.OtherEntity))
+             if (HasComp<ClimbableComponent>(otherFixture.Owner))
                  return;
          }