]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix getting stuck on tables (#21981)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Wed, 29 Nov 2023 13:23:21 +0000 (00:23 +1100)
committerGitHub <noreply@github.com>
Wed, 29 Nov 2023 13:23:21 +0000 (00:23 +1100)
Content.Shared/Climbing/Systems/ClimbSystem.cs

index c960b8e619437219a2b2c44475b9d89e721cb87d..6f6672e9510bfdfa50be28eafc9ec3750d51c6ea 100644 (file)
@@ -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;
          }