Fix crashes on cassette fly and on squish on Linux

Author: maddie480

Entities/BubbleReturnBerry.cs

@@ -1,6 +1,7 @@
 using Celeste.Mod.Entities;
 using Microsoft.Xna.Framework;
 using Monocle;
+using MonoMod.RuntimeDetour;
 using System;
 using System.Collections;
 
@@ -13,13 +14,33 @@ public BubbleReturnBerry(EntityData data, Vector2 position, EntityID gid) : base
         }
 
         public static void Load() {
-            On.Celeste.Player.OnSquish += ModOnSquish;
+            using (new DetourContext { After = { "*" } }) {
+                // fix player specific behavior allowing them to go through upside-down jumpthrus.
+                On.Celeste.Player.ctor += onPlayerConstructor;
+            }
         }
 
         public static void Unload() {
-            On.Celeste.Player.OnSquish -= ModOnSquish;
-        }
-
+            On.Celeste.Player.ctor -= onPlayerConstructor;
+        }
+
+        private static void onPlayerConstructor(On.Celeste.Player.orig_ctor orig, Player self, Vector2 position, PlayerSpriteMode spriteMode) {
+            orig(self, position, spriteMode);
+
+            Collision originalSquishCallback = self.SquishCallback;
+
+            Collision patchedSquishCallback = collisionData => {
+                // State 21 is the state where the player is located within the Cassette Bubble.
+                // They shouldn't be squished by moving blocks inside of it, so we prevent that.
+                if (self.StateMachine.State == 21)
+                    return;
+
+                originalSquishCallback(collisionData);
+            };
+
+            self.SquishCallback = patchedSquishCallback;
+        }
+
         public new void OnPlayer(Player player) {
             base.OnPlayer(player);
 
@@ -29,15 +50,6 @@ public static void Unload() {
             }
         }
 
-        private static void ModOnSquish(On.Celeste.Player.orig_OnSquish orig, Player player, CollisionData data) {
-            // State 21 is the state where the player is located within the Cassette Bubble.
-            // They shouldn't be squished by moving blocks inside of it, so we prevent that.
-            if (player.StateMachine.State == 21)
-                return;
-
-            orig(player, data);
-        }
-
         private IEnumerator Return(Player player) {
             yield return 0.3f;
 

Entities/SafeRespawnCrumble.cs

@@ -4,7 +4,8 @@
 using Monocle;
 using Celeste.Mod.Entities;
 using System.Reflection;
-
+using System;
+
 /*
  * Safe Respawn Crumble (Spring Collab 2020)
  * https://github.com/EverestAPI/SpringCollab2020/
@@ -16,7 +17,7 @@
  * It performs a similar role to Mario Maker's pink block platform,
  * which only spawns when a user playtests their level from an aerial position
  * and disappears once the user jumps off of it.
- */
+ */
 namespace Celeste.Mod.SpringCollab2020.Entities {
     [Tracked(false)]
     [CustomEntity("SpringCollab2020/safeRespawnCrumble")]
@@ -45,7 +46,7 @@ public override void Added(Scene scene) {
                 outlineTiles.Add(toDraw);
             } else {
                 // Select left, middle, or right
-                for (int tile = 0; (float)tile < base.Width; tile += 8) {
+                for (int tile = 0; (float) tile < base.Width; tile += 8) {
                     int tileTex;
                     if (tile == 0)
                         tileTex = 0;
@@ -92,7 +93,7 @@ public override void Added(Scene scene) {
         }
 
         private IEnumerator Sequence() {
-            for (;;) {
+            for (; ; ) {
                 // Wait until activated
                 Collidable = false;
                 while (!activated)
@@ -153,18 +154,23 @@ private IEnumerator TileFade(float to, List<Image> targetTiles, bool fast = fals
 
         // Bubble and player detection hooks
         public static void Load() {
-            On.Celeste.Player.CassetteFlyEnd += SafeActivatorCasetteFly;
+            On.Celeste.Player.CassetteFlyCoroutine += SafeActivatorCassetteFly;
             On.Celeste.Player.IntroRespawnBegin += SafeActivatorRespawn;
-        }
+        }
+
         public static void Unload() {
-            On.Celeste.Player.CassetteFlyEnd -= SafeActivatorCasetteFly;
+            On.Celeste.Player.CassetteFlyCoroutine -= SafeActivatorCassetteFly;
             On.Celeste.Player.IntroRespawnBegin -= SafeActivatorRespawn;
+        }
+
+        private static IEnumerator SafeActivatorCassetteFly(On.Celeste.Player.orig_CassetteFlyCoroutine orig, Player self) {
+            IEnumerator origEnum = orig(self);
+            while (origEnum.MoveNext())
+                yield return origEnum.Current;
+
+            SafeActivate(self, false);
         }
 
-        private static void SafeActivatorCasetteFly(On.Celeste.Player.orig_CassetteFlyEnd orig, Player self) {
-            orig(self);
-            SafeActivate(self, false);
-        }
         private static void SafeActivatorRespawn(On.Celeste.Player.orig_IntroRespawnBegin orig, Player self) {
             orig(self);
             SafeActivate(self, true);