Re-fix max health attribute

TownyAdvanced · Nov 19, 2024 · d1bb173 · d1bb173
1 parent 8274bd9
commit d1bb173
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/tasks/HealthRegenTimerTask.java b/Towny/src/main/java/com/palmergames/bukkit/towny/tasks/HealthRegenTimerTask.java
@@ -6,6 +6,7 @@
 import com.palmergames.bukkit.towny.object.TownBlock;
 
 import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.Server;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.Player;
@@ -78,7 +79,7 @@ private void evaluateHealth(Player player) {
 		// Heal 1 HP while in town.
 		final double currentHP = player.getHealth();
 		final double futureHP = currentHP + 1;
-		final double maxHP = player.getAttribute(getMaxHealthAttribute()).getValue();
+		final double maxHP = player.getAttribute(Registry.ATTRIBUTE.getOrThrow(NamespacedKey.minecraft("max_health"))).getValue();
 
 		// Shrink gained to fit below the maxHP.
 		final double gained = futureHP > maxHP ? 1.0 - (futureHP - maxHP) : 1.0;
@@ -96,12 +97,4 @@ private void tryIncreaseHealth(Player player, double currentHealth, double maxHe
 
 		player.setHealth(Math.min(maxHealth, event.getAmount() + currentHealth));
 	}
-
-	@SuppressWarnings("deprecation")
-	private Attribute getMaxHealthAttribute() {
-		if (MinecraftVersion.CURRENT_VERSION.isNewerThanOrEquals(MinecraftVersion.MINECRAFT_1_21_3))
-			return Attribute.MAX_HEALTH;
-		else
-			return Attribute.valueOf("GENERIC_MAX_HEALTH");
-	}
 }