From f0e837bd2bff1ddae38216734b54934964e83e48 Mon Sep 17 00:00:00 2001 From: MrPowerGamerBR Date: Fri, 30 May 2025 14:04:45 -0300 Subject: [PATCH] Updated Upstream (Paper / 2ba1675) --- gradle.properties | 2 +- .../src/main/java/org/spigotmc/WatchdogThread.java.patch | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 40020b2..28b7350 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=net.sparklypower.sparklypaper version=1.21.5-R0.1-SNAPSHOT mcVersion=1.21.5 -paperRef=a033e3b9ef78cfe85be807ac3fd1dd956274d4db +paperRef=2ba1675c7506cadd8a540ea452e5dafb79ae8947 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/sparklypaper-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch b/sparklypaper-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch index 4b59b5d..6880cbd 100644 --- a/sparklypaper-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch +++ b/sparklypaper-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch @@ -18,13 +18,12 @@ if (net.minecraft.world.level.Level.lastPhysicsProblem != null) { logger.log(Level.SEVERE, "------------------------------"); -@@ -107,8 +_,7 @@ +@@ -107,7 +_,7 @@ } // Paper end - Different message for short timeout logger.log(Level.SEVERE, "------------------------------"); - logger.log(Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):"); // Paper -- FeatureHooks.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - log detailed tick information + logger.log(Level.SEVERE, "Server thread dump (Look for plugins here before reporting to SparklyPaper!):"); // SparklyPaper - branding changes // Paper - WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE), logger); + FeatureHooks.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - log detailed tick information + WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.threadId(), Integer.MAX_VALUE), logger); logger.log(Level.SEVERE, "------------------------------"); -