Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@90a0835 Fix incremental player saving patch
PaperMC/Paper@f9f9079 Pull a few Folia patches
PaperMC/Paper@0f91091 Re-implement the compost events (#9192)
PaperMC/Paper@fa8fa1c Fix playing adventure sounds on World/Server (#8077)
This commit is contained in:
granny
2023-05-31 04:20:32 -07:00
parent 68117a4e35
commit d6cfa8f939
11 changed files with 45 additions and 57 deletions

View File

@@ -43,10 +43,10 @@ index 9d2d72fe48b69be2f6ebe74309673a3a4e51eae4..299d43f714637beb6cdce186368c4171
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 3f498543cf0476ff1b184788d93f13b70c476c16..9986b89ceabc065d96c889bf9a50a4aa093e7300 100644
index f3e1ba16446ff569f178a4bd16d328e8c2f0e40c..7dd5879f8f4938c2742bde1e58b06f9b909fc389 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3196,4 +3196,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3174,4 +3174,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end