Add DetourContexts to IL hooks for jumpthrus

Author: maddie480

Entities/SidewaysJumpThru.cs

@@ -30,17 +30,19 @@ public static void Load() {
             // block "climb hopping" on top of sideways jumpthrus, because this just looks weird.
             On.Celeste.Player.ClimbHopBlockedCheck += onPlayerClimbHopBlockedCheck;
 
-            // mod collide checks to include sideways jumpthrus, so that the player behaves with them like with walls.
-            IL.Celeste.Player.WallJumpCheck += modCollideChecks; // allow player to walljump off them
-            IL.Celeste.Player.ClimbCheck += modCollideChecks; // allow player to climb on them
-            IL.Celeste.Player.ClimbBegin += modCollideChecks; // if not applied, the player will clip through jumpthrus if trying to climb on them
-            IL.Celeste.Player.ClimbUpdate += modCollideChecks; // when climbing, jumpthrus are handled like walls
-            IL.Celeste.Player.SlipCheck += modCollideChecks; // make climbing on jumpthrus not slippery
-            IL.Celeste.Player.NormalUpdate += modCollideChecks; // get the wall slide effect
-            IL.Celeste.Player.OnCollideH += modCollideChecks; // handle dashes against jumpthrus properly, without "shifting" down
-
-            // have the push animation when Madeline runs against a jumpthru for example
-            hookOnUpdateSprite = new ILHook(typeof(Player).GetMethod(updateSpriteMethodToPatch, BindingFlags.NonPublic | BindingFlags.Instance), modCollideChecks);
+            using (new DetourContext()) {
+                // mod collide checks to include sideways jumpthrus, so that the player behaves with them like with walls.
+                IL.Celeste.Player.WallJumpCheck += modCollideChecks; // allow player to walljump off them
+                IL.Celeste.Player.ClimbCheck += modCollideChecks; // allow player to climb on them
+                IL.Celeste.Player.ClimbBegin += modCollideChecks; // if not applied, the player will clip through jumpthrus if trying to climb on them
+                IL.Celeste.Player.ClimbUpdate += modCollideChecks; // when climbing, jumpthrus are handled like walls
+                IL.Celeste.Player.SlipCheck += modCollideChecks; // make climbing on jumpthrus not slippery
+                IL.Celeste.Player.NormalUpdate += modCollideChecks; // get the wall slide effect
+                IL.Celeste.Player.OnCollideH += modCollideChecks; // handle dashes against jumpthrus properly, without "shifting" down
+
+                // have the push animation when Madeline runs against a jumpthru for example
+                hookOnUpdateSprite = new ILHook(typeof(Player).GetMethod(updateSpriteMethodToPatch, BindingFlags.NonPublic | BindingFlags.Instance), modCollideChecks);
+            }
 
             // one extra hook that kills the player momentum when hitting a jumpthru so that they don't get "stuck" on them.
             On.Celeste.Player.NormalUpdate += onPlayerNormalUpdate;

Entities/UpsideDownJumpThru.cs

@@ -33,13 +33,16 @@ public static void Load() {
                 On.Celeste.Player.ctor += onPlayerConstructor;
             }
 
-            // block player if they try to climb past an upside-down jumpthru.
-            IL.Celeste.Player.ClimbUpdate += patchPlayerClimbUpdate;
 
-            // ignore upside-down jumpthrus in select places.
-            playerOrigUpdateHook = new ILHook(typeof(Player).GetMethod("orig_Update"), filterOutJumpThrusFromCollideChecks);
-            IL.Celeste.Player.DashUpdate += filterOutJumpThrusFromCollideChecks;
-            IL.Celeste.Player.RedDashUpdate += filterOutJumpThrusFromCollideChecks;
+            using (new DetourContext()) {
+                // block player if they try to climb past an upside-down jumpthru.
+                IL.Celeste.Player.ClimbUpdate += patchPlayerClimbUpdate;
+
+                // ignore upside-down jumpthrus in select places.
+                playerOrigUpdateHook = new ILHook(typeof(Player).GetMethod("orig_Update"), filterOutJumpThrusFromCollideChecks);
+                IL.Celeste.Player.DashUpdate += filterOutJumpThrusFromCollideChecks;
+                IL.Celeste.Player.RedDashUpdate += filterOutJumpThrusFromCollideChecks;
+            }
         }
 
         public static void Unload() {