2020-11-07 18:24:16 +11:00
|
|
|
From 5dcc5cc6b1ae24be13659c2af1bdd4f4bffad021 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
|
|
|
|
|
|
|
|
|
2016-09-11 14:27:07 +10:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
|
2020-01-22 08:00:00 +11:00
|
|
|
index bb88f7c1a..194576502 100644
|
2016-09-11 14:27:07 +10:00
|
|
|
--- 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> {
|
2016-09-11 14:27:07 +10:00
|
|
|
|
2019-04-23 12:00:00 +10:00
|
|
|
@Override
|
2016-09-11 14:27:07 +10:00
|
|
|
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
|
2020-08-12 07:00:00 +10:00
|
|
|
index db97aed02..cc2bf8150 100644
|
2016-09-11 14:27:07 +10:00
|
|
|
--- 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;
|
2016-09-11 14:27:07 +10:00
|
|
|
+ public long timestamp;
|
|
|
|
|
|
|
|
public PacketPlayInUseItem() {}
|
|
|
|
|
2019-04-23 12:00:00 +10:00
|
|
|
@Override
|
2016-09-11 14:27:07 +10:00
|
|
|
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);
|
2020-08-12 07:00:00 +10:00
|
|
|
this.a = packetdataserializer.r();
|
2019-04-23 12:00:00 +10:00
|
|
|
}
|
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
|
2020-11-07 18:24:16 +11:00
|
|
|
index 16069e441..b42590438 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
|
2020-11-07 18:24:16 +11:00
|
|
|
@@ -1311,10 +1311,30 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
2019-07-20 09:00:00 +10:00
|
|
|
}
|
2016-03-01 08:33:06 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Spigot start - limit place/interactions
|
2016-09-11 14:27:07 +10:00
|
|
|
+ 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
|
2016-09-11 14:27:07 +10:00
|
|
|
+
|
2019-04-23 12:00:00 +10:00
|
|
|
@Override
|
2016-09-11 14:27:07 +10:00
|
|
|
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
|
2016-09-11 14:27:07 +10:00
|
|
|
+ if (!checkLimit(packetplayinuseitem.timestamp)) return; // Spigot - check limit
|
2020-06-25 10:00:00 +10:00
|
|
|
WorldServer worldserver = this.player.getWorldServer();
|
2019-04-23 12:00:00 +10:00
|
|
|
EnumHand enumhand = packetplayinuseitem.b();
|
2016-09-11 14:27:07 +10:00
|
|
|
ItemStack itemstack = this.player.b(enumhand);
|
2020-11-07 18:24:16 +11:00
|
|
|
@@ -1357,6 +1377,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
|
2016-09-11 14:27:07 +10:00
|
|
|
+ if (!checkLimit(packetplayinblockplace.timestamp)) return; // Spigot - check limit
|
2020-06-25 10:00:00 +10:00
|
|
|
WorldServer worldserver = this.player.getWorldServer();
|
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);
|
|
|
|
--
|
2020-05-09 18:48:11 +10:00
|
|
|
2.25.1
|
2016-03-01 08:33:06 +11:00
|
|
|
|