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

91 lines
4.1 KiB
Diff
Raw Normal View History

2021-04-28 08:10:22 +10:00
From a6143479c8f66d0e140e13c13e2d21a03c85868c 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
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java
2021-04-07 15:03:34 +10:00
index d6ceb631c..8a747926b 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java
+++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java
2021-04-07 15:03:34 +10:00
@@ -9,6 +9,7 @@ import net.minecraft.world.EnumHand;
public class PacketPlayInBlockPlace implements Packet<PacketListenerPlayIn> {
private EnumHand a;
+ public long timestamp; // Spigot
public PacketPlayInBlockPlace() {}
2021-04-07 15:03:34 +10:00
@@ -18,6 +19,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);
}
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java
2021-04-07 15:03:34 +10:00
index 1083e7d35..00f33483c 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java
+++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java
2021-04-07 15:03:34 +10:00
@@ -11,11 +11,13 @@ public class PacketPlayInUseItem implements Packet<PacketListenerPlayIn> {
2019-04-23 12:00:00 +10:00
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);
2020-08-12 07:00:00 +10:00
this.a = packetdataserializer.r();
2019-04-23 12:00:00 +10:00
}
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
2021-04-28 08:10:22 +10:00
index 9ab5c6bed..53b4c8a0c 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
2021-04-28 08:10:22 +10:00
@@ -1458,10 +1458,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
+ 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
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();
ItemStack itemstack = this.player.b(enumhand);
2021-04-28 08:10:22 +10:00
@@ -1504,6 +1524,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
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);
--
2.25.1
2016-03-01 08:33:06 +11:00