Updated Upstream (Bukkit/CraftBukkit/Spigot)

patches/server/0816-Add-player-health-update-API.patch

@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SamB440 <sam@islandearth.net>
+Date: Wed, 17 Nov 2021 12:31:42 +0000
+Subject: [PATCH] Add player health update API
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 261a2b4d750c0b57c3c83a82ee41a2bb7d770d8a..8de4ad9f2120d22b78202981624abd1d2fc70148 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -2013,9 +2013,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         this.getHandle().maxHealthCache = getMaxHealth();
+     }
+ 
+-    public void sendHealthUpdate() {
++    // Paper start
++    @Override
++    public void sendHealthUpdate(final double health, final int foodLevel, final float saturationLevel) {
+         // Paper start - cancellable death event
+-        ClientboundSetHealthPacket packet = new ClientboundSetHealthPacket(this.getScaledHealth(), this.getHandle().getFoodData().getFoodLevel(), this.getHandle().getFoodData().getSaturationLevel());
++        ClientboundSetHealthPacket packet = new ClientboundSetHealthPacket((float) health, foodLevel, saturationLevel);
+         if (this.getHandle().queueHealthUpdatePacket) {
+             this.getHandle().queuedHealthUpdatePacket = packet;
+         } else {
+@@ -2023,7 +2025,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         }
+         // Paper end
+     }
+-
++    
++    @Override
++    public void sendHealthUpdate() {
++        this.sendHealthUpdate(this.getScaledHealth(), this.getHandle().getFoodData().getFoodLevel(), this.getHandle().getFoodData().getSaturationLevel());
++    }
++    // Paper end
++    
+     public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
+         if (!this.scaledHealth && !force) {
+             return;