aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0769-Add-player-health-update-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0769-Add-player-health-update-API.patch')
-rw-r--r--patches/server/0769-Add-player-health-update-API.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0769-Add-player-health-update-API.patch b/patches/server/0769-Add-player-health-update-API.patch
new file mode 100644
index 0000000000..717cd2e501
--- /dev/null
+++ b/patches/server/0769-Add-player-health-update-API.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: SamB440 <[email protected]>
+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 3ff0c79134c1c474bc1e55b879394939a345562e..e02720435b6ed5f07a13d08a209caf6df49799ad 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -2221,9 +2221,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 {
+@@ -2231,7 +2233,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;