From df16594e00a4c672b219d9ca597fae783005290c Mon Sep 17 00:00:00 2001
From: fretuks <frederik@spirgi.com>
Date: Tue, 19 May 2026 19:49:06 +0200
Subject: [PATCH] Ensure health values do not exceed max health and reset
 health on death event

---
 src/main/java/net/fretux/ascend/event/PlayerEvents.java | 5 ++++-
 src/main/java/net/fretux/ascend/player/StatEffects.java | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/fretux/ascend/event/PlayerEvents.java b/src/main/java/net/fretux/ascend/event/PlayerEvents.java
index a38c063..54e5398 100644
--- a/src/main/java/net/fretux/ascend/event/PlayerEvents.java
+++ b/src/main/java/net/fretux/ascend/event/PlayerEvents.java
@@ -34,6 +34,9 @@ public class PlayerEvents {
         );
         if (!event.getEntity().level().isClientSide) {
             StatEffects.applyAll(event.getEntity());
+            if (event.isWasDeath()) {
+                event.getEntity().setHealth(event.getEntity().getMaxHealth());
+            }
             PlayerStatsProvider.sync(event.getEntity());
         }
     }
@@ -45,4 +48,4 @@ public class PlayerEvents {
             StatEffects.applyAll(event.getEntity());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/fretux/ascend/player/StatEffects.java b/src/main/java/net/fretux/ascend/player/StatEffects.java
index 5c081ec..10cf539 100644
--- a/src/main/java/net/fretux/ascend/player/StatEffects.java
+++ b/src/main/java/net/fretux/ascend/player/StatEffects.java
@@ -53,6 +53,9 @@ public final class StatEffects {
             if (IronsSpellbooksCompat.isLoaded()) {
                 IronsSpellbooksCompat.applyAll(player);
             }
+            if (player.getHealth() > player.getMaxHealth()) {
+                player.setHealth(player.getMaxHealth());
+            }
         });
     }