From 358a3829feabd5b4840174887432330b6eca5ed6 Mon Sep 17 00:00:00 2001 From: Thinkofdeath 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 index bb88f7c1..19457650 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 { private EnumHand a; + public long timestamp; // Spigot public PacketPlayInBlockPlace() {} @@ -14,6 +15,7 @@ public class PacketPlayInBlockPlace implements Packet { @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 index 2f8160ed..5941c3a5 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java +++ b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java @@ -6,11 +6,13 @@ public class PacketPlayInUseItem implements Packet { private MovingObjectPositionBlock a; private EnumHand b; + public long timestamp; public PacketPlayInUseItem() {} @Override public void a(PacketDataSerializer packetdataserializer) throws IOException { + this.timestamp = System.currentTimeMillis(); // Spigot this.b = (EnumHand) packetdataserializer.a(EnumHand.class); this.a = packetdataserializer.q(); } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index 57a83e02..590f48ba 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1215,10 +1215,30 @@ public class PlayerConnection implements PacketListenerPlayIn { // CraftBukkit end } + // 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; + } + // Spigot end + @Override public void a(PacketPlayInUseItem packetplayinuseitem) { PlayerConnectionUtils.ensureMainThread(packetplayinuseitem, this, this.player.getWorldServer()); if (this.player.isFrozen()) return; // CraftBukkit + if (!checkLimit(packetplayinuseitem.timestamp)) return; // Spigot - check limit WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); EnumHand enumhand = packetplayinuseitem.b(); ItemStack itemstack = this.player.b(enumhand); @@ -1251,6 +1271,7 @@ public class PlayerConnection implements PacketListenerPlayIn { public void a(PacketPlayInBlockPlace packetplayinblockplace) { PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.getWorldServer()); if (this.player.isFrozen()) return; // CraftBukkit + if (!checkLimit(packetplayinblockplace.timestamp)) return; // Spigot - check limit WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); EnumHand enumhand = packetplayinblockplace.b(); ItemStack itemstack = this.player.b(enumhand); -- 2.20.1