From 372e545d084c932cf48d6ed034eca5c8b9be8a45 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Apr 2020 21:26:16 -0400 Subject: [PATCH] Use better variable for isStopping() API Previous method only worked for a normal shutdown, and didn't include when the server enters a closing state due to watchdog crashes This is the correct variable to detect the server is in the middle of shutdown process --- Spigot-Server-Patches/Expose-MinecraftServer-isRunning.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/Expose-MinecraftServer-isRunning.patch index ce1487151..7f1c61f34 100644 --- a/Spigot-Server-Patches/Expose-MinecraftServer-isRunning.patch +++ b/Spigot-Server-Patches/Expose-MinecraftServer-isRunning.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 53b71b7915..1a3c6aae18 100644 +index 53b71b7915..8cc0f66ce5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -0,0 +0,0 @@ public final class CraftServer implements Server { @@ -16,7 +16,7 @@ index 53b71b7915..1a3c6aae18 100644 + + @Override + public boolean isStopping() { -+ return !net.minecraft.server.MinecraftServer.getServer().isRunning(); ++ return net.minecraft.server.MinecraftServer.getServer().hasStopped(); + } // Paper end }