aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0445-Limit-recipe-packets.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0445-Limit-recipe-packets.patch')
-rw-r--r--patches/server/0445-Limit-recipe-packets.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/patches/server/0445-Limit-recipe-packets.patch b/patches/server/0445-Limit-recipe-packets.patch
new file mode 100644
index 0000000000..a4c87098fa
--- /dev/null
+++ b/patches/server/0445-Limit-recipe-packets.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Sat, 12 Dec 2020 23:45:28 +0000
+Subject: [PATCH] Limit recipe packets
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 509cad3fe33a35ee22db173d84f7d8d35df4910c..e7a683ee53e44815d262a0d8c7a9c2ce2ca7a2b3 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -266,6 +266,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ // CraftBukkit start - multithreaded fields
+ private final AtomicInteger chatSpamTickCount = new AtomicInteger();
+ private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
++ private final java.util.concurrent.atomic.AtomicInteger recipeSpamPackets = new java.util.concurrent.atomic.AtomicInteger(); // Paper - auto recipe limit
+ // CraftBukkit end
+ private int dropSpamTickCount;
+ private double firstGoodX;
+@@ -384,6 +385,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+ // CraftBukkit start
+ for (int spam; (spam = this.chatSpamTickCount.get()) > 0 && !this.chatSpamTickCount.compareAndSet(spam, spam - 1); ) ;
+ if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - configurable tab spam limits
++ if (recipeSpamPackets.get() > 0) recipeSpamPackets.getAndDecrement(); // Paper - auto recipe limit
+ /* Use thread-safe field access instead
+ if (this.chatSpamTickCount > 0) {
+ --this.chatSpamTickCount;
+@@ -3070,6 +3072,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+
+ @Override
+ public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
++ // Paper start - auto recipe limit
++ if (!org.bukkit.Bukkit.isPrimaryThread()) {
++ if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
++ this.server.scheduleOnMain(() -> this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam")));
++ return;
++ }
++ }
++ // Paper end - auto recipe limit
+ PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+ this.player.resetLastActionTime();
+ if (!this.player.isSpectator() && this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu instanceof RecipeBookMenu) {