From 55d9deafe935559a25a1dfe241ce73f335a2e706 Mon Sep 17 00:00:00 2001
From: Sunk <69110309+Sunketchupm@users.noreply.github.com>
Date: Tue, 8 Oct 2024 19:01:47 -0400
Subject: [PATCH] Fix invincibility

---
 src/game/interaction.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/game/interaction.c b/src/game/interaction.c
index b8b963b49..f4e6a4295 100644
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@@ -1474,8 +1474,10 @@ u32 interact_player_pvp(struct MarioState* attacker, struct MarioState* victim)
         // not moving down yet?
         if (attacker->actionState == 0) { return FALSE; }
         victim->bounceSquishTimer = max(victim->bounceSquishTimer, 20);
-    } else if ((attacker->action == ACT_FORWARD_ROLLOUT || attacker->action == ACT_BACKWARD_ROLLOUT) &&
-                attacker->actionState == 1) {
+    }
+    // Make rollouts unable to be attacked during the flip
+    if ((cVictim->action == ACT_FORWARD_ROLLOUT || cVictim->action == ACT_BACKWARD_ROLLOUT) &&
+                cVictim->actionState == 1) {
         return FALSE;
     }