2020-05-06 05:48:49 -04:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-07-02 21:37:56 -05:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
|
|
Date: Sun, 2 Jul 2017 21:35:56 -0500
|
|
|
|
Subject: [PATCH] Block player logins during server shutdown
|
|
|
|
|
|
|
|
|
2021-03-16 00:19:45 -07:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
|
|
|
|
index 9f87503c58f64bbfa829faa58600d7d9e64aecf1..651b84b3bba316407a217c941be4c20074c5bb90 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/network/LoginListener.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/LoginListener.java
|
|
|
|
@@ -68,6 +68,12 @@ public class LoginListener implements PacketLoginInListener {
|
2017-07-02 21:37:56 -05:00
|
|
|
}
|
|
|
|
|
2018-12-17 05:18:06 +00:00
|
|
|
public void tick() {
|
2017-07-02 21:37:56 -05:00
|
|
|
+ // Paper start - Do not allow logins while the server is shutting down
|
|
|
|
+ if (!MinecraftServer.getServer().isRunning()) {
|
2020-08-27 16:58:27 -04:00
|
|
|
+ this.disconnect(org.bukkit.craftbukkit.util.CraftChatMessage.fromString(org.spigotmc.SpigotConfig.restartMessage)[0]);
|
2017-07-27 21:38:25 -05:00
|
|
|
+ return;
|
2017-07-02 21:37:56 -05:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
if (this.g == LoginListener.EnumProtocolState.READY_TO_ACCEPT) {
|
2019-04-27 19:23:53 -04:00
|
|
|
this.c();
|
2017-07-02 21:37:56 -05:00
|
|
|
} else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
|