fix: sometimes Health Bar shows wrong in Rift

Fix3dll · Jan 29, 2025 · 84f8893 · 84f8893
1 parent b1c2724
commit 84f8893
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/src/main/java/codes/biscuit/skyblockaddons/core/PlayerStats.java b/src/main/java/codes/biscuit/skyblockaddons/core/PlayerStats.java
@@ -6,28 +6,27 @@
  * Contains a player's stats. This includes health, mana and defence...
  */
 public enum PlayerStats {
-
-    DEFENCE(new MutableFloat(0)),
-    HEALTH(new MutableFloat(100)),
-    MAX_HEALTH(new MutableFloat(100)),
-    MAX_RIFT_HEALTH(new MutableFloat(0)),
-    MANA(new MutableFloat(100)),
-    MAX_MANA(new MutableFloat(100)),
-    FUEL(new MutableFloat(3000)),
-    MAX_FUEL(new MutableFloat(3000)),
-    OVERFLOW_MANA(new MutableFloat(20));
+    DEFENCE(0),
+    HEALTH(100),
+    MAX_HEALTH(100),
+    MAX_RIFT_HEALTH(0),
+    MANA(100),
+    MAX_MANA(100),
+    FUEL(3000),
+    MAX_FUEL(3000),
+    OVERFLOW_MANA(20);
 
     private final MutableFloat mutableValue;
 
-    PlayerStats(MutableFloat defaultValue) {
-        this.mutableValue = defaultValue;
+    PlayerStats(float defaultValue) {
+        this.mutableValue = new MutableFloat(defaultValue);
     }
 
     public float getValue() {
-        return mutableValue.getValue();
+        return this.mutableValue.getValue();
     }
 
     public void setValue(final float value) {
-        mutableValue.setValue(value);
+        this.mutableValue.setValue(value);
     }
 }
diff --git a/src/main/java/codes/biscuit/skyblockaddons/listeners/PlayerListener.java b/src/main/java/codes/biscuit/skyblockaddons/listeners/PlayerListener.java
@@ -208,6 +208,7 @@ public void onWorldJoin(EntityJoinWorldEvent e) {
             NPCUtils.getNpcLocations().clear();
             JerryPresent.getJerryPresents().clear();
             FishParticleManager.clearParticleCache();
+            main.getRenderListener().setMaxRiftHealth(0.0F);
         }
     }
 

diff --git a/src/main/java/codes/biscuit/skyblockaddons/listeners/RenderListener.java b/src/main/java/codes/biscuit/skyblockaddons/listeners/RenderListener.java
@@ -184,13 +184,12 @@ public class RenderListener {
     @Setter private SkillType skill;
     @Setter private String skillText;
 
-    @Setter
-    private EnumUtils.GUIType guiToOpen;
+    @Setter private EnumUtils.GUIType guiToOpen;
     private int guiPageToOpen = 1;
     private EnumUtils.GuiTab guiTabToOpen = EnumUtils.GuiTab.MAIN;
     private Feature guiFeatureToOpen;
 
-    private float maxRiftHealth = 0.0F;
+    @Setter private float maxRiftHealth = 0.0F;
 
     // caching
     private PetManager.Pet pet = null;