Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2946dbb Update WorldServer#serverlevelData mapping
PaperMC/Paper@98af0e0 update generator
PaperMC/Paper@20507b4 Apply more patches
PaperMC/Paper@7162ff0 fix item meta
PaperMC/Paper@7d67d3f fix DamageTypeTags init
PaperMC/Paper@0971875 re-add improve perf of mass crafts
This commit is contained in:
granny
2024-10-27 00:12:43 -07:00
parent 76614d2235
commit 10cf69623e
26 changed files with 112 additions and 112 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6bb44716544e0c3dd3fce8d20e351cb5d4010e4c..8e1bf5e86ee517408b1fad6a23f666d897de77ee 100644
index 0dd2f6c53047f122c769f8615fbaad692ffada29..d63629001dc92ae4b2055df58bde5d97c0ecc3bc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1604,6 +1604,42 @@ public final class CraftServer implements Server {
@@ -1608,6 +1608,42 @@ public final class CraftServer implements Server {
net.minecraft.world.item.ItemStack itemStack = net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material));
MinecraftServer.getServer().fuelValues().values.keySet().removeIf(itemStack::is);
}