Updated Upstream (CraftBukkit) (#9053)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: f92c94517 SPIGOT-7310: PlayerToggleSneakEvent is not called when a player sneaks while riding an entity b5714184d SPIGOT-7316: Cancelling EntityUnmountEvent does not stop the all effects of the unmounting e237f8c88 SPIGOT-7312: Entity#setVisibleByDefault on player causes skin reset on this player client
This commit is contained in:
parent
a622ebacd4
commit
fbf74ba0ac
70 changed files with 226 additions and 207 deletions
|
@ -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 8f88d8a6f05d0f021608a035a39354ad480150f4..3a870ba7c66340ac47e6f6445cf99542d41415c6 100644
|
||||
index 9833e8bce6cc45fa053b71f64d71a57c1630595f..dae4efa2bceaf2d4e0ed573c9cbc49a8edda0202 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2334,9 +2334,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2344,9 +2344,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
this.getHandle().maxHealthCache = getMaxHealth();
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ index 8f88d8a6f05d0f021608a035a39354ad480150f4..3a870ba7c66340ac47e6f6445cf99542
|
|||
if (this.getHandle().queueHealthUpdatePacket) {
|
||||
this.getHandle().queuedHealthUpdatePacket = packet;
|
||||
} else {
|
||||
@@ -2345,6 +2347,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2355,6 +2357,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
// Paper end
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue