testserver/CraftBukkit-Patches/0126-Limit-block-placement-...

65 lines
3.2 KiB
Diff
Raw Normal View History

From 81f80c7cbd36b7974b0ca1d29c1986e4dcc63511 Mon Sep 17 00:00:00 2001
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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 208757d..2fa99b3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -616,9 +616,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
2014-11-28 01:17:45 +00:00
// CraftBukkit end
}
+ // Spigot start - limit place/interactions
+ private long lastPlace = -1;
+ private int packets = 0;
+
public void a(PacketPlayInBlockPlace packetplayinblockplace) {
2014-11-28 01:17:45 +00:00
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u());
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
+ boolean throttled = false;
+ if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
+ throttled = true;
+ } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
+ {
+ lastPlace = packetplayinblockplace.timestamp;
+ packets = 0;
+ }
+ // Spigot end
2014-11-28 01:17:45 +00:00
// CraftBukkit start
2014-11-28 01:17:45 +00:00
if (this.player.dead) return;
@@ -642,7 +655,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
// CraftBukkit start
int itemstackAmount = itemstack.count;
-
+ // Spigot start - skip the event if throttled
+ if (!throttled) {
// Raytrace to look for 'rogue armswings'
float f1 = this.player.pitch;
float f2 = this.player.yaw;
@@ -678,6 +692,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
if (!cancelled) {
this.player.playerInteractManager.useItem(this.player, this.player.world, itemstack);
}
+ }
+ // Spigot end
// CraftBukkit - notch decrements the counter by 1 in the above method with food,
// snowballs and so forth, but he does it in a place that doesn't cause the
@@ -703,7 +719,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
}
2014-11-28 01:17:45 +00:00
if (this.checkMovement && this.player.e((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && !this.minecraftServer.a(worldserver, blockposition, this.player) && worldserver.af().a(blockposition)) {
- always = !this.player.playerInteractManager.interact(this.player, worldserver, itemstack, blockposition, enumdirection, packetplayinblockplace.d(), packetplayinblockplace.e(), packetplayinblockplace.f());
+ always = throttled || !this.player.playerInteractManager.interact(this.player, worldserver, itemstack, blockposition, enumdirection, packetplayinblockplace.d(), packetplayinblockplace.e(), packetplayinblockplace.f());
}
// CraftBukkit end
2014-11-28 01:17:45 +00:00
--
2014-11-28 01:17:45 +00:00
2.1.0