From 5091db06d98f7db3d373766591f6a636ff9c8bf9 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/network/protocol/game/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java index 74612f5f7..afec33eef 100644 --- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java +++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java @@ -9,6 +9,7 @@ public class PacketPlayInBlockPlace implements Packet { private final EnumHand hand; private final int sequence; + public long timestamp; // Spigot public PacketPlayInBlockPlace(EnumHand enumhand, int i) { this.hand = enumhand; @@ -16,6 +17,7 @@ public class PacketPlayInBlockPlace implements Packet { } public PacketPlayInBlockPlace(PacketDataSerializer packetdataserializer) { + this.timestamp = System.currentTimeMillis(); // Spigot this.hand = (EnumHand) packetdataserializer.readEnum(EnumHand.class); this.sequence = packetdataserializer.readVarInt(); } diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java index 675909dc6..44ed8f10d 100644 --- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java +++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInUseItem.java @@ -11,6 +11,7 @@ public class PacketPlayInUseItem implements Packet { private final MovingObjectPositionBlock blockHit; private final EnumHand hand; private final int sequence; + public long timestamp; // Spigot public PacketPlayInUseItem(EnumHand enumhand, MovingObjectPositionBlock movingobjectpositionblock, int i) { this.hand = enumhand; @@ -19,6 +20,7 @@ public class PacketPlayInUseItem implements Packet { } public PacketPlayInUseItem(PacketDataSerializer packetdataserializer) { + this.timestamp = System.currentTimeMillis(); // Spigot this.hand = (EnumHand) packetdataserializer.readEnum(EnumHand.class); this.blockHit = packetdataserializer.readBlockHitResult(); this.sequence = packetdataserializer.readVarInt(); diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java index 0e1ef15f8..3f2924aa2 100644 --- a/src/main/java/net/minecraft/server/network/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java @@ -1589,10 +1589,30 @@ public class PlayerConnection implements ServerPlayerConnection, TickablePacketL } } + // 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 handleUseItemOn(PacketPlayInUseItem packetplayinuseitem) { PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinuseitem, this, this.player.serverLevel()); if (this.player.isImmobile()) return; // CraftBukkit + if (!checkLimit(packetplayinuseitem.timestamp)) return; // Spigot - check limit this.player.connection.ackBlockChangesUpTo(packetplayinuseitem.getSequence()); WorldServer worldserver = this.player.serverLevel(); EnumHand enumhand = packetplayinuseitem.getHand(); @@ -1646,6 +1666,7 @@ public class PlayerConnection implements ServerPlayerConnection, TickablePacketL public void handleUseItem(PacketPlayInBlockPlace packetplayinblockplace) { PlayerConnectionUtils.ensureRunningOnSameThread(packetplayinblockplace, this, this.player.serverLevel()); if (this.player.isImmobile()) return; // CraftBukkit + if (!checkLimit(packetplayinblockplace.timestamp)) return; // Spigot - check limit this.ackBlockChangesUpTo(packetplayinblockplace.getSequence()); WorldServer worldserver = this.player.serverLevel(); EnumHand enumhand = packetplayinblockplace.getHand(); -- 2.40.1