SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make UseItem rate limiting stricter, configurable

Browse Source
This commit is contained in:
Zach Brown
2016-09-10 23:27:07 -05:00
parent 5ba385dd4c
commit 4bf0ca21fe
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Spigot-Server-Patches/Rate-limit-PacketPlayInUseItem.patch
View File

@@ -4,6 +4,20 @@ Date: Sat, 10 Sep 2016 21:40:51 -0500
Subject: [PATCH] Rate limit PacketPlayInUseItem Subject: [PATCH] Rate limit PacketPlayInUseItem
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
private static void bungeeOnlineMode() {
bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
}
+
+ public static int playInUseItemThreshold = 300;
+ private static void playInUseItemThreshold() {
+ playInUseItemThreshold = getInt("settings.play-in-use-item-spam-threshold", 300);
+ }
}
diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java --- a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
@@ -43,6 +57,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start - Rate limit UseItem as well, copied from Spigot implementation below in BlockPlace + // Paper start - Rate limit UseItem as well, copied from Spigot implementation below in BlockPlace
+ private long lastPlaceUse = -1; + private long lastPlaceUse = -1;
+ private int packetsUse = 0; + private int packetsUse = 0;
+ private static final int THRESHOLD = com.destroystokyo.paper.PaperConfig.playInUseItemThreshold;
+ // Paper end + // Paper end
public void a(PacketPlayInUseItem packetplayinuseitem) { public void a(PacketPlayInUseItem packetplayinuseitem) {
PlayerConnectionUtils.ensureMainThread(packetplayinuseitem, this, this.player.x()); PlayerConnectionUtils.ensureMainThread(packetplayinuseitem, this, this.player.x());
@@ -53,9 +68,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.player.resetIdleTimer(); this.player.resetIdleTimer();
+ +
+ // Paper start - Rate limit UseItem as well, copied from Spigot implementation below in BlockPlace + // Paper start - Rate limit UseItem as well, copied from Spigot implementation below in BlockPlace
+ if (lastPlaceUse != -1 && packetplayinuseitem.timestamp - lastPlaceUse < 30 && packetsUse++ >= 4) { + if (lastPlaceUse != -1 && packetplayinuseitem.timestamp - lastPlaceUse < THRESHOLD && packetsUse++ >= 4) {
+ return; + return;
+ } else if (packetplayinuseitem.timestamp - lastPlaceUse >= 30 || lastPlaceUse == -1) { + } else if (packetplayinuseitem.timestamp - lastPlaceUse >= THRESHOLD || lastPlaceUse == -1) {
+ lastPlaceUse = packetplayinuseitem.timestamp; + lastPlaceUse = packetplayinuseitem.timestamp;
+ packetsUse = 0; + packetsUse = 0;
+ } + }