From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 19 Aug 2020 05:05:54 +0100 Subject: [PATCH] Buffer joins to world This patch buffers the number of logins which will attempt to join the world per tick, this attempts to reduce the impact that join floods has on the server diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java index 077950ba6da2af1afc6edbf4449b37fb0893088a..805f15a6236088894d75904ae190f987131d943a 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -315,14 +315,29 @@ public class Connection extends SimpleChannelInboundHandler> { } // Paper end - add pending task queue } + private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper + private static int joinAttemptsThisTick; // Paper + private static int currTick; // Paper public void tick() { this.flushQueue(); + // Paper start + if (Connection.currTick != net.minecraft.server.MinecraftServer.currentTick) { + Connection.currTick = net.minecraft.server.MinecraftServer.currentTick; + Connection.joinAttemptsThisTick = 0; + } + // Paper end PacketListener packetlistener = this.packetListener; if (packetlistener instanceof TickablePacketListener) { TickablePacketListener tickablepacketlistener = (TickablePacketListener) packetlistener; + // Paper start - limit the number of joins which can be processed each tick + if (!(this.packetListener instanceof net.minecraft.server.network.ServerLoginPacketListenerImpl loginPacketListener) + || loginPacketListener.state != net.minecraft.server.network.ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT + || Connection.joinAttemptsThisTick++ < MAX_PER_TICK) { tickablepacketlistener.tick(); + } + // Paper end } if (!this.isConnected() && !this.disconnectionHandled) {