Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-22 18:46:27 +01:00
Code Issues Projects Releases Wiki Activity

Im blind pls dont blame me kthx

Browse Source
This commit is contained in:
Ivan Pekov 2020-09-22 21:29:12 +03:00
parent 6d289f2412
commit 1af2160432
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0052-Fix-watchdog-termination-hanging-indefinitely.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Fix watchdog termination hanging indefinitely
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8e4cdad1b76c24f4e459077c5a2b4b08e0a7134f..6f0c4f5c42ca687bae0efa131087a393b8f06685 100644
index 8e4cdad1b76c24f4e459077c5a2b4b08e0a7134f..ac159f71acc1a0fa612399b4fb77c2d1612b16b2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -820,6 +820,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -14,7 +14,7 @@ index 8e4cdad1b76c24f4e459077c5a2b4b08e0a7134f..6f0c4f5c42ca687bae0efa131087a393
} catch (java.lang.InterruptedException ignored) {} // Paper
+ // Yatopia start - fix watchdog hanging indefinitely
+ MCUtil.cleanerExecutor.shutdown();
+ try { MCUtil.asyncExecutor.awaitTermination(30, java.util.concurrent.TimeUnit.SECONDS);
+ try { MCUtil.cleanerExecutor.awaitTermination(30, java.util.concurrent.TimeUnit.SECONDS);
+ } catch (InterruptedException ignored) {}
+ // Yatopia end
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {