From e00487b0cc3096a5b1f257b0b416767c9e23a985 Mon Sep 17 00:00:00 2001 From: granny Date: Wed, 4 Dec 2024 02:30:09 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@d0645d9 Update readme, set updatingMinecraft to false PaperMC/Paper@747cac4 Updated Upstream (CraftBukkit) PaperMC/Paper@416a733 Apply coordinate offset only to VoxelShape --- gradle.properties | 2 +- patches/server/0228-Allow-void-trading.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index d9fd8cb8e..523fff11c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.4-R0.1-SNAPSHOT mcVersion = 1.21.4 -paperCommit = 3b35456b3f5773f6384c0ae5edd21549394cd3a4 +paperCommit = 416a73304809d94c11a2bf22bbb2ad438a0dd68c org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0228-Allow-void-trading.patch b/patches/server/0228-Allow-void-trading.patch index b744f6d0d..01b07a6c3 100644 --- a/patches/server/0228-Allow-void-trading.patch +++ b/patches/server/0228-Allow-void-trading.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 9ceaf051ebc9d58b584b93832cc21ad43ac1a558..48d6b3d45d73c8f235f51a9652f33c81b3472a12 100644 +index a580610c6e528cd3a54f88f6d1031db1e6c46028..d0653880e8f8852a27e16c5c964fb7b86c40d542 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2850,7 +2850,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2854,7 +2854,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // Spigot Start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message // Paper start - Fix merchant inventory not closing on entity removal