Block player logins during server shutdown

Adds GH-765
This commit is contained in:
Zach Brown 2017-07-02 21:37:56 -05:00
parent b1d34f6180
commit 9aae84ea43
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76

View File

@ -0,0 +1,25 @@
From 52556556cd008f116a83ac71df9ad003d1ba3f91 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 2158fcd3..2367023c 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -53,6 +53,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
}
public void e() {
+ // Paper start - Do not allow logins while the server is shutting down
+ if (!MinecraftServer.getServer().isRunning()) {
+ this.disconnect(new ChatMessage(org.spigotmc.SpigotConfig.restartMessage));
+ }
+ // Paper end
if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) {
this.b();
} else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
--
2.13.2.windows.1