From bac4f18e23065986e64d18e85c8aefde5ec46651 Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Thu, 28 Oct 2021 20:16:08 +0100
Subject: [PATCH] Revert to using deprecated methods for now

---
 .../me/william278/husksync/bukkit/util/PlayerSetter.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java
index c15e0e9d..e822ebfa 100644
--- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java
+++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java
@@ -11,6 +11,8 @@ import org.bukkit.*;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.advancement.AdvancementProgress;
 import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -20,7 +22,6 @@ import org.bukkit.potion.PotionEffect;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.logging.Level;
 
@@ -40,7 +41,7 @@ public class PlayerSetter {
                 DataSerializer.serializeInventory(player.getInventory().getContents()),
                 DataSerializer.serializeInventory(player.getEnderChest().getContents()),
                 player.getHealth(),
-                Objects.requireNonNull(player.getAttribute(Attribute.GENERIC_MAX_HEALTH)).getBaseValue(),
+                player.getMaxHealth(),
                 player.getHealthScale(),
                 player.getFoodLevel(),
                 player.getSaturation(),
@@ -149,8 +150,8 @@ public class PlayerSetter {
                     setPlayerEnderChest(player, DataSerializer.deserializeInventory(data.getSerializedEnderChest()));
                 }
                 if (Settings.syncHealth) {
-                    player.setHealthScale(data.getHealthScale() <= 0 ? data.getHealthScale() : 20D);
-                    Objects.requireNonNull(player.getAttribute(Attribute.GENERIC_MAX_HEALTH)).setBaseValue(data.getMaxHealth());
+                    player.setMaxHealth(data.getMaxHealth());
+                    player.setHealthScale(data.getHealthScale());
                     player.setHealth(data.getHealth());
                 }
                 if (Settings.syncHunger) {