From 98cc31d6cb5d7ac39274adea1ac16674bbd616bc Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 17 Oct 2020 23:27:34 -0700
Subject: [PATCH] Do not consider inactive players when bubbled

---
 src/game/mario_actions_automatic.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c
index 5da7504f..f069a761 100644
--- a/src/game/mario_actions_automatic.c
+++ b/src/game/mario_actions_automatic.c
@@ -927,6 +927,7 @@ s32 act_bubbled(struct MarioState* m) {
     if (m->playerIndex == 0) {
         u8 allInBubble = TRUE;
         for (int i = 0; i < MAX_PLAYERS; i++) {
+            if (!is_player_active(&gMarioStates[i])) { continue; }
             if (gMarioStates[i].action != ACT_BUBBLED && gMarioStates[i].health >= 0x100) {
                 allInBubble = FALSE;
                 break;