From b4bec1df3b0d1eaaa07b969dd8cd6494c88782c7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Jul 2017 21:35:56 -0500 Subject: [PATCH] Block player logins during server shutdown diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java index fae8a13973..005efbc111 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -50,6 +50,12 @@ public class LoginListener implements PacketLoginInListener, ITickable { } public void Y_() { + // Paper start - Do not allow logins while the server is shutting down + if (!MinecraftServer.getServer().isRunning()) { + this.disconnect(new ChatMessage(org.spigotmc.SpigotConfig.restartMessage)); + return; + } + // Paper end if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) { this.b(); } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { -- 2.18.0