From 8c1ec4beba3e669d0680e79990e3704db4055da4 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Thu, 24 Sep 2020 21:37:07 -0700
Subject: [PATCH] Prevent bubbled players from 'dying' to quicksand again

---
 src/game/mario_actions_cutscene.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c
index a1d27d22..d437d717 100644
--- a/src/game/mario_actions_cutscene.c
+++ b/src/game/mario_actions_cutscene.c
@@ -2776,6 +2776,8 @@ static s32 check_for_instant_quicksand(struct MarioState *m) {
         // never kill remote marios
         return FALSE;
     }
+    if (m->action == ACT_BUBBLED) { return FALSE; }
+
     if (m->floor->type == SURFACE_INSTANT_QUICKSAND && m->action & ACT_FLAG_INVULNERABLE
         && m->action != ACT_QUICKSAND_DEATH) {
         update_mario_sound_and_camera(m);