SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not try to stop main thread during watchdog shutdown

Browse Source 
In Java 21, Thread#stop is no longer implemented and wiill throw
an exception when called. As a result, we simply cannot halt
the main thread during shutdown anymore.
This commit is contained in:
Spottedleaf
2024-07-15 12:46:23 -07:00
parent 043559513c
commit e3d92c508f
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/Improved-Watchdog-Support.patch
View File

@@ -108,15 +108,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start - kill main thread, and kill it hard + // Paper start - kill main thread, and kill it hard
+ shutdownThread = Thread.currentThread(); + shutdownThread = Thread.currentThread();
+ org.spigotmc.WatchdogThread.doStop(); // Paper + org.spigotmc.WatchdogThread.doStop(); // Paper
+ if (!isSameThread()) {
+ MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER)");
+ while (this.getRunningThread().isAlive()) {
+ this.getRunningThread().stop();
+ try {
+ Thread.sleep(1);
+ } catch (InterruptedException e) {}
+ }
+ }
+ // Paper end + // Paper end
// CraftBukkit end // CraftBukkit end
if (this.metricsRecorder.isRecording()) { if (this.metricsRecorder.isRecording()) {