diff --git a/Spigot-Server-Patches/0564-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0564-Buffer-joins-to-world.patch index c00ab7dd71..0de11bc5c3 100644 --- a/Spigot-Server-Patches/0564-Buffer-joins-to-world.patch +++ b/Spigot-Server-Patches/0564-Buffer-joins-to-world.patch @@ -22,10 +22,10 @@ index 9fc12595a566f216620a7fb296d2d30e22332689..f65d3545039a2c471819ab5950c171ef + } } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 48fc9f40050685ea08af8da54ae8a00cf3d8ee36..ac8d642f26b0ad99068638fe539d84786d86042e 100644 +index 48fc9f40050685ea08af8da54ae8a00cf3d8ee36..c9b36e6040f03e6cee46989bab8415d829f8eef4 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java -@@ -363,10 +363,23 @@ public class NetworkManager extends SimpleChannelInboundHandler> { +@@ -363,10 +363,22 @@ public class NetworkManager extends SimpleChannelInboundHandler> { } // Paper end @@ -43,7 +43,6 @@ index 48fc9f40050685ea08af8da54ae8a00cf3d8ee36..ac8d642f26b0ad99068638fe539d8478 if (this.packetListener instanceof LoginListener) { + if ( ((LoginListener) this.packetListener).getLoginState() != LoginListener.EnumProtocolState.READY_TO_ACCEPT // Paper + || (joinAttemptsThisTick++ < MAX_PER_TICK)) { // Paper - limit the number of joins which can be processed each tick -+ System.out.println("tick " + joinAttemptsThisTick + "/" + MAX_PER_TICK); ((LoginListener) this.packetListener).tick(); + } // Paper }