From af3ffc6a7e90eb89f8a73291717e6cd3eb038500 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
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 3683fa2984..6f7c715794 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener {
     }
 
     public void tick() {
+        // 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.c();
         } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
-- 
2.24.1