2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2016-09-11 19:55:02 +00:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
|
|
Date: Sun, 11 Sep 2016 14:30:57 -0500
|
|
|
|
Subject: [PATCH] Configurable packet in spam threshold
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
2020-05-06 09:48:49 +00:00
|
|
|
index 53f96a1576582fce83999a1f7e9a2624506ed51f..010b17d2e7a27ace6ff8b15edff577c4164d2e81 100644
|
2016-09-11 19:55:02 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
2019-05-06 07:20:16 +00:00
|
|
|
@@ -243,4 +243,13 @@ public class PaperConfig {
|
2018-10-19 00:44:59 +00:00
|
|
|
public static boolean isProxyOnlineMode() {
|
|
|
|
return Bukkit.getOnlineMode() || (SpigotConfig.bungee && bungeeOnlineMode);
|
2016-09-11 19:55:02 +00:00
|
|
|
}
|
2018-10-19 00:44:59 +00:00
|
|
|
+
|
2016-09-11 19:55:02 +00:00
|
|
|
+ public static int packetInSpamThreshold = 300;
|
|
|
|
+ private static void packetInSpamThreshold() {
|
|
|
|
+ if (version < 11) {
|
|
|
|
+ int oldValue = getInt("settings.play-in-use-item-spam-threshold", 300);
|
|
|
|
+ set("settings.incoming-packet-spam-threshold", oldValue);
|
|
|
|
+ }
|
|
|
|
+ packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2020-06-25 01:10:30 +00:00
|
|
|
index c00ada6c10529fd50b0d7fbb1763b6e09287a1fc..6a6739bba0ad9a5fadac7a49e698c2435200c1fc 100644
|
2016-09-11 19:55:02 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2020-02-09 00:32:48 +00:00
|
|
|
@@ -1204,13 +1204,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
2016-09-11 19:55:02 +00:00
|
|
|
// Spigot start - limit place/interactions
|
|
|
|
private int limitedPackets;
|
|
|
|
private long lastLimitedPacket = -1;
|
|
|
|
+ private static final int THRESHOLD = com.destroystokyo.paper.PaperConfig.packetInSpamThreshold; // Paper - Configurable threshold
|
|
|
|
|
|
|
|
private boolean checkLimit(long timestamp) {
|
|
|
|
- if (lastLimitedPacket != -1 && timestamp - lastLimitedPacket < 30 && limitedPackets++ >= 4) {
|
2016-11-05 03:31:37 +00:00
|
|
|
+ if (lastLimitedPacket != -1 && timestamp - lastLimitedPacket < THRESHOLD && limitedPackets++ >= 8) { // Paper - Use threshold, raise packet limit to 8
|
2016-09-11 19:55:02 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
- if (lastLimitedPacket == -1 || timestamp - lastLimitedPacket >= 30) {
|
|
|
|
+ if (lastLimitedPacket == -1 || timestamp - lastLimitedPacket >= THRESHOLD) { // Paper
|
|
|
|
lastLimitedPacket = timestamp;
|
|
|
|
limitedPackets = 0;
|
|
|
|
return true;
|