Fixup adapting health when scaling

1 year ago · b63e1bd283
parent 575122e6dd
commit b63e1bd283
1 changed files with 4 additions and 3 deletions
--- a/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
+++ b/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
@ -808,10 +808,11 @@ public abstract class BukkitData implements Data {

        @NotNull
        public static BukkitData.Health adapt(@NotNull Player player) {
+            final double maxHealth = getMaxHealth(player);
            return from(
-                    player.getHealth(),
-                    getMaxHealth(player),
-                    player.getHealthScale()
+                    Math.min(player.getHealth(), maxHealth),
+                    maxHealth,
+                    player.isHealthScaled() ? player.getHealthScale() : 0d
            );
        }