mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit) (#7323)

Browse source
This commit is contained in:
Jake Potrebic 2022-01-12 13:39:20 -08:00 • committed by GitHub
parent ebaca20edd
commit 0c64d401aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
83 changed files with 238 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/server/0815-Add-player-health-update-API.patch
View file

@ -5,10 +5,10 @@ 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
index d41d85f28e3eb7d6b9c9addc743e5bc09dd217c9..148e1985017f6955267b5c970730645394d700f6 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 {
@@ -2027,9 +2027,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().maxHealthCache = getMaxHealth();
}
@ -22,7 +22,7 @@ index 261a2b4d750c0b57c3c83a82ee41a2bb7d770d8a..8de4ad9f2120d22b78202981624abd1d
if (this.getHandle().queueHealthUpdatePacket) {
this.getHandle().queuedHealthUpdatePacket = packet;
} else {
@@ -2023,7 +2025,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2037,7 +2039,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper end
}