mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2025-02-27 17:52:11 +01:00
Some stuff wouldn't be _that_ heavy with this change. Is not a very big deal, but it provides extra performance.
23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ivan Pekov <ivan@mrivanplays.com>
|
|
Date: Tue, 22 Sep 2020 21:18:24 +0300
|
|
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 54682f927088c8017ab0718df9bfb6c2fa3c844b..a51857cbeaa927392390275f966392f59163c087 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
|
|
MCUtil.asyncExecutor.shutdown(); // Paper
|
|
try { MCUtil.asyncExecutor.awaitTermination(30, java.util.concurrent.TimeUnit.SECONDS); // Paper
|
|
} catch (java.lang.InterruptedException ignored) {} // Paper
|
|
+ // Yatopia start - fix watchdog hanging indefinitely
|
|
+ MCUtil.cleanerExecutor.shutdown();
|
|
+ try { MCUtil.cleanerExecutor.awaitTermination(30, java.util.concurrent.TimeUnit.SECONDS);
|
|
+ } catch (InterruptedException ignored) {}
|
|
+ // Yatopia end
|
|
if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
|
|
LOGGER.info("Saving usercache.json");
|
|
this.getUserCache().b(false); // Paper
|