Ensure max-health is always reset

Signed-off-by: applenick <[email protected]>
PGMDev · Jun 8, 2021 · 65f0bf0 · 65f0bf0
1 parent 66455cd
commit 65f0bf0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/kits/MaxHealthKit.java b/core/src/main/java/tc/oc/pgm/kits/MaxHealthKit.java
@@ -8,7 +8,7 @@
 
 public class MaxHealthKit extends AbstractKit {
 
-  public static final double DEFAULT_MAX_HEALTH = 20.0;
+  public static final double BUKKIT_DEFAULT = 20.0;
 
   private final double maxHealth;
 
@@ -29,6 +29,6 @@ public boolean isRemovable() {
 
   @Override
   public void remove(MatchPlayer player) {
-    player.getBukkit().setMaxHealth(DEFAULT_MAX_HEALTH);
+    player.getBukkit().setMaxHealth(BUKKIT_DEFAULT);
   }
 }
diff --git a/core/src/main/java/tc/oc/pgm/match/MatchPlayerImpl.java b/core/src/main/java/tc/oc/pgm/match/MatchPlayerImpl.java
@@ -43,6 +43,7 @@
 import tc.oc.pgm.api.time.Tick;
 import tc.oc.pgm.events.PlayerResetEvent;
 import tc.oc.pgm.kits.Kit;
+import tc.oc.pgm.kits.MaxHealthKit;
 import tc.oc.pgm.kits.WalkSpeedKit;
 import tc.oc.pgm.util.Audience;
 import tc.oc.pgm.util.ClassLogger;
@@ -259,6 +260,7 @@ public void reset() {
     bukkit.setFallDistance(0);
     bukkit.setFireTicks(0);
     bukkit.setFoodLevel(20); // full
+    bukkit.setMaxHealth(MaxHealthKit.BUKKIT_DEFAULT);
     bukkit.setHealth(bukkit.getMaxHealth());
     bukkit.setLevel(0);
     bukkit.setExp(0); // clear xp