diff options
| author | EvilSeph <evilseph@gmail.com> | 2012-01-10 22:19:23 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-01-10 22:19:23 -0500 |
| commit | 194f54a90eabd2449370636bcbbb44f7906b8e02 (patch) | |
| tree | 25bca7695b4b1052398150cf77721275d5001fb0 /src | |
| parent | bff4d0f696a44f345b0d898906309c17641e7161 (diff) | |
| download | craftbukkit-194f54a90eabd2449370636bcbbb44f7906b8e02.tar craftbukkit-194f54a90eabd2449370636bcbbb44f7906b8e02.tar.gz craftbukkit-194f54a90eabd2449370636bcbbb44f7906b8e02.tar.lz craftbukkit-194f54a90eabd2449370636bcbbb44f7906b8e02.tar.xz craftbukkit-194f54a90eabd2449370636bcbbb44f7906b8e02.zip | |
Revert "Improved our handling of player interactions."
This reverts commit b4d325e0efe44bc74e69371fb11e7c3e1124b2a3.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 70f662ff..16ec9ee6 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -495,11 +495,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { if (i1 < this.server.getSpawnRadius() && !flag) { this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, worldserver)); } else { - // CraftBukkit start - if (this.getPlayer().getTargetBlock(null, 6).getLocation().equals(new Location(worldserver.getWorld(), i, j, k))) { - this.player.itemInWorldManager.dig(i, j, k, packet14blockdig.face); - } - // CraftBukkit end + this.player.itemInWorldManager.dig(i, j, k, packet14blockdig.face); } } else if (packet14blockdig.e == 2) { this.player.itemInWorldManager.a(i, j, k); @@ -591,11 +587,11 @@ public class NetServerHandler extends NetHandler implements ICommandListener { return; } flag = true; // spawn protection moved to ItemBlock!!! + // CraftBukkit end - if (j1 > 16 || flag && this.getPlayer().getTargetBlock(null, 6).getLocation().equals(new Location(worldserver.getWorld(), i, j, k))) { + if (j1 > 16 || flag) { this.player.itemInWorldManager.interact(this.player, worldserver, itemstack, i, j, k, l); } - // CraftBukkit end this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, worldserver)); if (l == 0) { |