spigot/CraftBukkit-Patches/0073-Limit-block-placement-interaction-packets.patch

91 lines
4 KiB
Diff
Raw Normal View History

2019-07-11 08:18:03 +10:00
From 37e295b3ec4a4953f9b1ee7ca882137ee2317b86 Mon Sep 17 00:00:00 2001
2016-03-01 08:33:06 +11:00
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sun, 29 Jun 2014 21:10:34 +0100
Subject: [PATCH] Limit block placement/interaction packets
diff --git a/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
2019-04-25 12:00:00 +10:00
index bb88f7c1a..194576502 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
@@ -5,6 +5,7 @@ import java.io.IOException;
public class PacketPlayInBlockPlace implements Packet<PacketListenerPlayIn> {
private EnumHand a;
+ public long timestamp; // Spigot
public PacketPlayInBlockPlace() {}
2019-04-23 12:00:00 +10:00
@@ -14,6 +15,7 @@ public class PacketPlayInBlockPlace implements Packet<PacketListenerPlayIn> {
2019-04-23 12:00:00 +10:00
@Override
public void a(PacketDataSerializer packetdataserializer) throws IOException {
+ this.timestamp = System.currentTimeMillis(); // Spigot
this.a = (EnumHand) packetdataserializer.a(EnumHand.class);
}
diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
2019-04-25 12:00:00 +10:00
index 2f8160ed1..5941c3a5e 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
2019-04-23 12:00:00 +10:00
@@ -6,11 +6,13 @@ public class PacketPlayInUseItem implements Packet<PacketListenerPlayIn> {
private MovingObjectPositionBlock a;
private EnumHand b;
+ public long timestamp;
public PacketPlayInUseItem() {}
2019-04-23 12:00:00 +10:00
@Override
public void a(PacketDataSerializer packetdataserializer) throws IOException {
+ this.timestamp = System.currentTimeMillis(); // Spigot
2019-04-23 12:00:00 +10:00
this.b = (EnumHand) packetdataserializer.a(EnumHand.class);
this.a = packetdataserializer.q();
}
2016-03-01 08:33:06 +11:00
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-06-21 20:00:00 +10:00
index 67a11013e..2ecc699a2 100644
2016-03-01 08:33:06 +11:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-05-28 06:30:00 +10:00
@@ -1218,10 +1218,30 @@ public class PlayerConnection implements PacketListenerPlayIn {
// CraftBukkit end
2016-03-01 08:33:06 +11:00
}
+ // Spigot start - limit place/interactions
+ private int limitedPackets;
+ private long lastLimitedPacket = -1;
+
+ private boolean checkLimit(long timestamp) {
+ if (lastLimitedPacket != -1 && timestamp - lastLimitedPacket < 30 && limitedPackets++ >= 4) {
+ return false;
+ }
+
+ if (lastLimitedPacket == -1 || timestamp - lastLimitedPacket >= 30) {
+ lastLimitedPacket = timestamp;
+ limitedPackets = 0;
+ return true;
+ }
+
+ return true;
+ }
2016-03-01 08:33:06 +11:00
+ // Spigot end
+
2019-04-23 12:00:00 +10:00
@Override
public void a(PacketPlayInUseItem packetplayinuseitem) {
2018-07-15 10:00:00 +10:00
PlayerConnectionUtils.ensureMainThread(packetplayinuseitem, this, this.player.getWorldServer());
2016-11-17 12:41:12 +11:00
if (this.player.isFrozen()) return; // CraftBukkit
+ if (!checkLimit(packetplayinuseitem.timestamp)) return; // Spigot - check limit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
2019-04-23 12:00:00 +10:00
EnumHand enumhand = packetplayinuseitem.b();
ItemStack itemstack = this.player.b(enumhand);
2019-05-28 06:30:00 +10:00
@@ -1254,6 +1274,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
2016-03-01 08:33:06 +11:00
public void a(PacketPlayInBlockPlace packetplayinblockplace) {
2018-07-15 10:00:00 +10:00
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.getWorldServer());
2016-11-17 12:41:12 +11:00
if (this.player.isFrozen()) return; // CraftBukkit
+ if (!checkLimit(packetplayinblockplace.timestamp)) return; // Spigot - check limit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
2018-07-15 10:00:00 +10:00
EnumHand enumhand = packetplayinblockplace.b();
2016-03-01 08:33:06 +11:00
ItemStack itemstack = this.player.b(enumhand);
--
2019-04-23 09:33:25 +10:00
2.20.1
2016-03-01 08:33:06 +11:00