Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5ffdff8 Fix a couple of bed bugs (#9112)
PaperMC/Paper@e338793 Optimize hoppers by not trying to merge full items. (#9110)
PaperMC/Paper@bd35d60 [ci-skip] Fix missing closing quote (#9126)
PaperMC/Paper@8d040fa Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
granny
2023-04-13 18:05:06 -07:00
parent f952106e1b
commit f69b21de45
9 changed files with 20 additions and 20 deletions

View File

@@ -43,10 +43,10 @@ index cc7187c597337665d3cf3c3de4b53e3105b9e4c3..59071de0e66876ae15defe1bd636846e
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ca22b7de2dd05a0bdcdcd3bffb9ec991d196abde..7015d95a53dc55ab4ccd15fa2b98716bbb460dae 100644
index c8d8ab8e5d8d0a986ff023ce1e195667472d7798..4cbd2816f0cdd0d7745bc70ccd0b288769e74498 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3189,4 +3189,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3188,4 +3188,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end