40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
|
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 c6c742e541e6bb5214e3c2c245bbe5988f7c2b41..05352929a9652f3b857b7888f42eef2059842739 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -1980,9 +1980,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 {
|
||
|
|
@@ -1990,7 +1992,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;
|