2020-08-25 13:30:57 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
|
|
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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
2020-11-18 04:45:18 +01:00
|
|
|
index e0422471776f34b8e3c753d855aa06f00cc049ec..2e9c3b45052ad641bee091ee28cc57b93cd19ffe 100644
|
2020-08-25 13:30:57 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
2020-11-09 01:09:37 +01:00
|
|
|
@@ -452,4 +452,9 @@ public class PaperConfig {
|
2020-08-25 13:30:57 +02:00
|
|
|
maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public static int maxJoinsPerTick;
|
|
|
|
+ private static void maxJoinsPerTick() {
|
2020-08-25 14:23:58 +02:00
|
|
|
+ maxJoinsPerTick = getInt("settings.max-joins-per-tick", 3);
|
2020-08-25 13:30:57 +02:00
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
|
2020-11-03 03:22:15 +01:00
|
|
|
index 4ddd3a819648fe5418a19d4496a18dc20c4e086e..7a84ea4116be070ab878e55b0cd919f3f3688f30 100644
|
2020-08-25 13:30:57 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/NetworkManager.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
|
2020-08-25 14:30:52 +02:00
|
|
|
@@ -363,10 +363,22 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
2020-08-25 13:30:57 +02:00
|
|
|
}
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
+ private static final int MAX_PER_TICK = com.destroystokyo.paper.PaperConfig.maxJoinsPerTick; // Paper
|
|
|
|
+ private static int joinAttemptsThisTick; // Paper
|
|
|
|
+ private static int currTick; // Paper
|
|
|
|
public void a() {
|
|
|
|
this.p();
|
|
|
|
+ // Paper start
|
|
|
|
+ if (currTick != MinecraftServer.currentTick) {
|
|
|
|
+ currTick = MinecraftServer.currentTick;
|
|
|
|
+ joinAttemptsThisTick = 0;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
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
|
|
|
|
((LoginListener) this.packetListener).tick();
|
|
|
|
+ } // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this.packetListener instanceof PlayerConnection) {
|