summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2011-09-14 22:22:56 -0400
committerEvilSeph <evilseph@gmail.com>2011-09-14 22:29:26 -0400
commit6e44626d0aa68caaea1e56df5e2e0ab66dd2da06 (patch)
tree6fdeeb2e1856bc49f8bd0e9e623d81e39dca1ba5 /src/main/java/net
parentd71e83d8d2de347426a4d076006619f66666d95c (diff)
downloadcraftbukkit-6e44626d0aa68caaea1e56df5e2e0ab66dd2da06.tar
craftbukkit-6e44626d0aa68caaea1e56df5e2e0ab66dd2da06.tar.gz
craftbukkit-6e44626d0aa68caaea1e56df5e2e0ab66dd2da06.tar.lz
craftbukkit-6e44626d0aa68caaea1e56df5e2e0ab66dd2da06.tar.xz
craftbukkit-6e44626d0aa68caaea1e56df5e2e0ab66dd2da06.zip
Fixed item drop protection.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 4f1884e4..d5f355bc 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -431,8 +431,6 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
if (packet14blockdig.e == 4) {
- this.player.J();
- } else if (packet14blockdig.e == 5) {
// CraftBukkit start
// If the ticks aren't the same then the count starts from 0 and we update the lastDropTick.
if (this.lastDropTick != MinecraftServer.currentTick) {
@@ -444,9 +442,12 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
if (this.dropCount >= 20) {
a.warning(this.player.name + " dropped their items too quickly!");
this.disconnect("You dropped your items too quickly (Hacking?)");
+ return;
}
}
// CraftBukkit end
+ this.player.J();
+ } else if (packet14blockdig.e == 5) {
this.player.E();
} else {
boolean flag = worldserver.weirdIsOpCache = worldserver.dimension != 0 || this.minecraftServer.serverConfigurationManager.isOp(this.player.name); // CraftBukkit