mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

There is no reason to continue if we DC a player during shutdown

Browse source 
Thanks Ice
This commit is contained in:
Zach Brown 2017-07-27 21:38:25 -05:00
parent 7afc930c25
commit 5c5e998cde
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Spigot-Server-Patches/0220-Block-player-logins-during-server-shutdown.patch
View file

@ -1,25 +1,26 @@
From 52556556cd008f116a83ac71df9ad003d1ba3f91 Mon Sep 17 00:00:00 2001 From 0b3e79d1a621e3ffb9785ab06e7e0192d11d13d9 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 2 Jul 2017 21:35:56 -0500 Date: Sun, 2 Jul 2017 21:35:56 -0500
Subject: [PATCH] Block player logins during server shutdown 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 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 2158fcd3..2367023c 100644 index 2158fcd32..c5434e6ba 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java --- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/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 { @@ -53,6 +53,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
} }
public void e() { public void e() {
+ // Paper start - Do not allow logins while the server is shutting down + // Paper start - Do not allow logins while the server is shutting down
+ if (!MinecraftServer.getServer().isRunning()) { + if (!MinecraftServer.getServer().isRunning()) {
+ this.disconnect(new ChatMessage(org.spigotmc.SpigotConfig.restartMessage)); + this.disconnect(new ChatMessage(org.spigotmc.SpigotConfig.restartMessage));
+ return;
+ } + }
+ // Paper end + // Paper end
if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) { if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) {
this.b(); this.b();
} else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
-- --
2.13.2.windows.1 2.13.3.windows.1