From 5d3463aaa0472c7d3c2028ea4d0ad3fb128785d2 Mon Sep 17 00:00:00 2001 From: granny Date: Thu, 29 May 2025 21:34:39 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6f315356 Add MCUtil#toLocation from Folia PaperMC/Paper@2ba1675c Replace deprecated Thread#getId usage with Thread#threadId --- gradle.properties | 2 +- .../files/src/main/java/org/spigotmc/WatchdogThread.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index b1bdc18d1..90f55875d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.5-R0.1-SNAPSHOT mcVersion = 1.21.5 -paperCommit = 47650100837178e2852bdb50d8c9c6f0cc0bb2e0 +paperCommit = 2ba1675c7506cadd8a540ea452e5dafb79ae8947 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch b/purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch index 1d6ab6004..8f0126c5f 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch @@ -40,7 +40,7 @@ - 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 Purpur!):" ); // Paper // Purpur - 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 +_,7 @@ WatchdogThread.dumpThread(thread, logger);