diff options
Diffstat (limited to 'patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch')
| -rw-r--r-- | patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch index 5b396410c9..282fda5b52 100644 --- a/patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch @@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns if any are still running after that delay just as reload does. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 386f8b825dac6dda253b0c55a3a0eeef5bdca271..0087e8037e2d30d940e6efa886226e59e8daa98f 100644 +index 92cb9a0a479f3dc1c78eda42191d020106d059dd..2575129d1647eda4acb1ce4f19619f42257cb6f8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -936,6 +936,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -22,10 +22,10 @@ index 386f8b825dac6dda253b0c55a3a0eeef5bdca271..0087e8037e2d30d940e6efa886226e59 // CraftBukkit end if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.shutdown(); // Paper - Plugin remapping diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c6a96664ef914d0da1e24b93da93bad1b4a17716..45799f96978a68a79b4c89e17e9b543dec99a8b1 100644 +index 13ef7ed49526b9f0d1ec376ec3242e14f66f0a23..91b8fefc2c97c1f487bde1559d4ccf76795ca954 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1024,6 +1024,32 @@ public final class CraftServer implements Server { +@@ -1047,6 +1047,32 @@ public final class CraftServer implements Server { org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload } |