From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 18 Jan 2022 06:35:54 -0600 Subject: [PATCH] Max joins per second When this option is set to true the `max-joins-per-tick` setting in paper.yml will be used per second instead of per tick diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java index 507e98438f6d13de1bcf063db673a8e483dbea47..c5f497df73e7ff8ec41c24cc684eed36da77ccb7 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -562,11 +562,20 @@ public class Connection extends SimpleChannelInboundHandler> { 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 + private static int tickSecond; // Purpur public void tick() { this.flushQueue(); // Paper start if (currTick != net.minecraft.server.MinecraftServer.currentTick) { currTick = net.minecraft.server.MinecraftServer.currentTick; + // Purpur start + if (org.purpurmc.purpur.PurpurConfig.maxJoinsPerSecond) { + if (++tickSecond > 20) { + tickSecond = 0; + joinAttemptsThisTick = 0; + } + } else + // Purpur end joinAttemptsThisTick = 0; } // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 1992a4452b6f69a88501f29516681623db67e481..15bf97076dd7acc2ab7e36e1ccdea4188c87bf09 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -471,8 +471,10 @@ public class PurpurConfig { } public static boolean useUPnP = false; + public static boolean maxJoinsPerSecond = false; private static void networkSettings() { useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP); + maxJoinsPerSecond = getBoolean("settings.network.max-joins-per-second", maxJoinsPerSecond); } public static java.util.regex.Pattern usernameValidCharactersPattern;