From c39c270a37b6474d76fb476da70556664f9c8cd8 Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 8 Jun 2025 11:31:48 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@73d218c1 Improve command permission lookups PaperMC/Paper@7c2ffd5e Prune the api version suffix PaperMC/Paper@c609d6dc Remove SERVER_ONLY command flag functionality PaperMC/Paper@3594d24a Properly send over SADDLE and BODY equipment items to PlayerInventory PaperMC/Paper@720e63ff Remove craft flying PaperMC/Paper@1e441025 Removed inlined art api PaperMC/Paper@adb5aefc Add api for shear equippable logic PaperMC/Paper@4604c5f2 Change ordering on YamlSanitizationTest PaperMC/Paper@c986ce54 Fix V4307 ordering issues PaperMC/Paper@48e94e8c fix sponge absorb resetting block entity data of waterlogged blocks PaperMC/Paper@c5fc0dc8 support block state mutation of already placed block entity in BlockStateListPopulator --- .../Run_Purpur_Paperclip_Jar.xml | 4 ++-- gradle.properties | 2 +- .../commands/CommandSourceStack.java.patch | 4 ++-- .../minecraft/commands/Commands.java.patch | 4 ++-- .../minecraft/world/level/Level.java.patch | 2 +- .../features/0006-fix-tests.patch | 20 ------------------- 6 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 purpur-server/paper-patches/features/0006-fix-tests.patch diff --git a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml index cdd44578f..f285361d8 100644 --- a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml +++ b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml @@ -1,6 +1,6 @@ - - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6f8529412..564b95259 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.6-R0.1-SNAPSHOT mcVersion = 1.21.6-pre3 -paperCommit = 94fefb88e6af6e7699d16d949dc4cee88e0c4a1b +paperCommit = c5fc0dc84b2e9f875b7dc03ed75cf6744abc4902 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch index 8863fb3c8..007fa82c9 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/commands/CommandSourceStack.java +++ b/net/minecraft/commands/CommandSourceStack.java -@@ -457,6 +_,19 @@ +@@ -447,6 +_,19 @@ } // CraftBukkit end @@ -20,7 +20,7 @@ public Vec3 getPosition() { return this.worldPosition; } -@@ -541,6 +_,30 @@ +@@ -531,6 +_,30 @@ } } } diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch index 0fc215487..3e54cc7b4 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch @@ -24,7 +24,7 @@ } if (selection.includeIntegrated) { -@@ -535,6 +_,7 @@ +@@ -537,6 +_,7 @@ private void runSync(ServerPlayer player, java.util.Collection bukkit, RootCommandNode rootCommandNode) { // Paper end - Perf: Async command map building new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API @@ -32,7 +32,7 @@ org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit)); event.getPlayer().getServer().getPluginManager().callEvent(event); -@@ -545,6 +_,8 @@ +@@ -547,6 +_,8 @@ } } // CraftBukkit end diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch index eddf86fda..dc002e072 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch @@ -65,7 +65,7 @@ this.generator = generator; this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment); -@@ -2131,4 +_,14 @@ +@@ -2124,4 +_,14 @@ return this.id; } } diff --git a/purpur-server/paper-patches/features/0006-fix-tests.patch b/purpur-server/paper-patches/features/0006-fix-tests.patch deleted file mode 100644 index 876fc5584..000000000 --- a/purpur-server/paper-patches/features/0006-fix-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: granny -Date: Thu, 5 Jun 2025 20:05:32 -0700 -Subject: [PATCH] fix tests - - -diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java -index 6ecfd6209dc2c994b43d29d328668435e16c69d1..f92ce0a220b347e54252ebaf3123d5abca807c22 100644 ---- a/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java -+++ b/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java -@@ -94,8 +94,8 @@ public class YamlSerializationTest { - count: 1 - components: - minecraft:unbreakable: '{}' -+ minecraft:tooltip_display: '{hidden_components:["minecraft:unbreakable","minecraft:enchantments"]}' - minecraft:enchantments: '{"minecraft:sharpness":2}' -- minecraft:tooltip_display: '{hidden_components:["minecraft:enchantments","minecraft:unbreakable"]}' - schema_version: 1 - """.formatted(Bukkit.getUnsafe().getDataVersion())); - }