From 71a8697bfba37dbd616bc78cf924f4b0dd860d45 Mon Sep 17 00:00:00 2001
From: FitzRoyX <57089001+FitzRoyX@users.noreply.github.com>
Date: Mon, 14 Nov 2022 10:27:41 -0600
Subject: [PATCH] fix dying over deep water without flippers or as a bunny
 (#126)

---
 player.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/player.c b/player.c
index 18666d36..af5ad5e2 100644
--- a/player.c
+++ b/player.c
@@ -730,7 +730,12 @@ void Link_HandleRecoilAndTimer(bool jump_into_middle) {  // 878711
         link_item_in_hand = 0;
         link_position_mode = 0;
         player_handler_timer = 0;
-        link_disable_sprite_damage = 0;
+        //link can die and revive over deep water without flippers or as a bunny
+        if ((enhanced_features0 & kFeatures0_MiscBugFixes) && (!link_item_flippers || link_is_bunny || link_is_bunny_mirror)) {
+          link_disable_sprite_damage = 1;
+        } else {
+          link_disable_sprite_damage = 0;
+        }
         link_electrocute_on_touch = 0;
         link_actual_vel_x = 0;
         link_actual_vel_y = 0;