Fix StatusBarTracker

2 files changed, 10 insertions, 6 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
index e8f98e93..c31e2107 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/StatusBarTracker.java
@@ -21,8 +21,8 @@ public class StatusBarTracker {
     private int defense = 0;
 
     public void init() {
+        ClientReceiveMessageEvents.ALLOW_GAME.register(this::allowOverlayMessage);
         ClientReceiveMessageEvents.MODIFY_GAME.register(this::onOverlayMessage);
-        ClientReceiveMessageEvents.GAME_CANCELED.register(this::onOverlayMessage);
     }
 
     public Resource getHealth() {
@@ -66,6 +66,11 @@ public class StatusBarTracker {
         return str;
     }
 
+    private boolean allowOverlayMessage(Text text, boolean overlay) {
+        onOverlayMessage(text, overlay);
+        return true;
+    }
+
     private Text onOverlayMessage(Text text, boolean overlay) {
         if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().general.bars.enableBars || Utils.isInTheRift()) {
             return text;
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java
index c058da5d..9ab4e927 100644
--- a/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java
@@ -15,13 +15,12 @@ class StatusBarTrackerTest {
 
     void assertStats(int hp, int maxHp, int def, int mana, int maxMana, int overflowMana) {
         int absorption = 0;
-        if(hp > maxHp) {
-            absorption = hp - maxHp;
-            hp -= absorption;
-            if(absorption > maxHp)
-                absorption = maxHp;
+        if (hp > maxHp) {
+            absorption = Math.min(hp - maxHp, maxHp);
+            hp = maxHp;
         }
         assertEquals(new StatusBarTracker.Resource(hp, maxHp, absorption), tracker.getHealth());
+        assertEquals(def, tracker.getDefense());
         assertEquals(new StatusBarTracker.Resource(mana, maxMana, overflowMana), tracker.getMana());
     }