mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 01:10:37 +01:00
7c8937d0c6
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
17ff1e04 SPIGOT-4483: Missing EntityInteractEvent call for zombies on eggs
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 7961a44c32429c4b9ba1ca80f5dd68e3fb253db0 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 19ac21e38..8bbea9624 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.19.1
|
|
|