From b63e1bd283d096f3c08365a0b36ff3c7d5fa30e8 Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Fri, 22 Sep 2023 21:48:39 +0100
Subject: [PATCH] Fixup adapting health when scaling

---
 .../main/java/net/william278/husksync/data/BukkitData.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java b/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
index 1a124ae0..7c90859a 100644
--- 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
             );
         }