From da5610cdc484d33cb950cf7dee6ae11b7f218dd6 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Tue, 3 Jun 2025 07:31:23 +0800 Subject: [PATCH] Updated Upstream (Paper/Purpur) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@47650100 Improve error messages when PluginRemapper fails to initialize (#12598) PaperMC/Paper@6f315356 Add MCUtil#toLocation from Folia PaperMC/Paper@2ba1675c Replace deprecated Thread#getId usage with Thread#threadId Purpur Changes: PurpurMC/Purpur@470df8e7 will this bandaid fix work? PurpurMC/Purpur@f565bc23 use daemon in github actions workflow PurpurMC/Purpur@42286249 Updated Upstream (Paper) PurpurMC/Purpur@fe690f55 Updated Upstream (Paper) PurpurMC/Purpur@5d3463aa Updated Upstream (Paper) --- gradle.properties | 2 +- leaf-api/paper-patches/features/0013-Purpur-API-Changes.patch | 2 +- .../features/0099-Purpur-Server-Minecraft-Changes.patch | 2 +- leaf-server/paper-patches/features/0001-Rebrand.patch | 4 ++-- .../features/0009-Purpur-Server-Paper-Changes.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6cf054e0..27469c7c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=cn.dreeam.leaf mcVersion=1.21.5 version=1.21.5-R0.1-SNAPSHOT -paperCommit=a033e3b9ef78cfe85be807ac3fd1dd956274d4db +paperCommit=2ba1675c7506cadd8a540ea452e5dafb79ae8947 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/leaf-api/paper-patches/features/0013-Purpur-API-Changes.patch b/leaf-api/paper-patches/features/0013-Purpur-API-Changes.patch index 18cfe3cc..67bf4523 100644 --- a/leaf-api/paper-patches/features/0013-Purpur-API-Changes.patch +++ b/leaf-api/paper-patches/features/0013-Purpur-API-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: fd78b90f2041e50b2a94110859b951fc8fa320e9 +Commit: 5d3463aaa0472c7d3c2028ea4d0ad3fb128785d2 Patches listed below are removed in this patch, They exists in Gale or Leaf: * "co/aikar/timings/TimedEventExecutor.java.patch" diff --git a/leaf-server/minecraft-patches/features/0099-Purpur-Server-Minecraft-Changes.patch b/leaf-server/minecraft-patches/features/0099-Purpur-Server-Minecraft-Changes.patch index 7f7bcb78..f84034ae 100644 --- a/leaf-server/minecraft-patches/features/0099-Purpur-Server-Minecraft-Changes.patch +++ b/leaf-server/minecraft-patches/features/0099-Purpur-Server-Minecraft-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Minecraft Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: fd78b90f2041e50b2a94110859b951fc8fa320e9 +Commit: 5d3463aaa0472c7d3c2028ea4d0ad3fb128785d2 Patches listed below are removed in this patch, They exists in Gale or Leaf: * "net/minecraft/CrashReport.java.patch" diff --git a/leaf-server/paper-patches/features/0001-Rebrand.patch b/leaf-server/paper-patches/features/0001-Rebrand.patch index 92f5ea9a..e9666902 100644 --- a/leaf-server/paper-patches/features/0001-Rebrand.patch +++ b/leaf-server/paper-patches/features/0001-Rebrand.patch @@ -467,7 +467,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..c3d45e60e262b8e34d76f0425f6bef79 if (stream != null) { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 471941a5bf691d4c31b2eb5ef4a11dc91499f674..56f920067d9bdd6f239741d699f0746bbe54a3f5 100644 +index c77748061f1c8bb2b0dc8dbd80f608d431752015..79eae898539f71a73525ed29d8a752f65f5f67fa 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -25,7 +25,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre @@ -522,7 +522,7 @@ index 471941a5bf691d4c31b2eb5ef4a11dc91499f674..56f920067d9bdd6f239741d699f0746b - logger.log(Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):"); // Paper + logger.log(Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Leaf!):"); // Paper // Gale - branding changes // Leaf - Rebrand FeatureHooks.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - log detailed tick information - WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE), logger); + WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.threadId(), Integer.MAX_VALUE), logger); logger.log(Level.SEVERE, "------------------------------"); @@ -120,7 +132,13 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre WatchdogThread.dumpThread(thread, logger); diff --git a/leaf-server/paper-patches/features/0009-Purpur-Server-Paper-Changes.patch b/leaf-server/paper-patches/features/0009-Purpur-Server-Paper-Changes.patch index 33ee4b80..da547a66 100644 --- a/leaf-server/paper-patches/features/0009-Purpur-Server-Paper-Changes.patch +++ b/leaf-server/paper-patches/features/0009-Purpur-Server-Paper-Changes.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Paper Changes Original license: MIT Original project: https://github.com/PurpurMC/Purpur -Commit: fd78b90f2041e50b2a94110859b951fc8fa320e9 +Commit: 5d3463aaa0472c7d3c2028ea4d0ad3fb128785d2 Patches listed below are removed in this patch, They exists in Gale or Leaf: * "Rebrand.patch"