Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 22:44:17 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Improved our handling of player interactions."

Browse Source 
This reverts commit b4d325e0efe44bc74e69371fb11e7c3e1124b2a3.
This commit is contained in:
EvilSeph 2012-01-10 22:19:23 -05:00
parent bff4d0f696
commit 194f54a90e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@ -495,11 +495,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
if (i1 < this.server.getSpawnRadius() && !flag) { if (i1 < this.server.getSpawnRadius() && !flag) {
this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, worldserver)); this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, worldserver));
} else { } else {
// CraftBukkit start this.player.itemInWorldManager.dig(i, j, k, packet14blockdig.face);
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
} }
} else if (packet14blockdig.e == 2) { } else if (packet14blockdig.e == 2) {
this.player.itemInWorldManager.a(i, j, k); this.player.itemInWorldManager.a(i, j, k);
@ -591,11 +587,11 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
return; return;
} }
flag = true; // spawn protection moved to ItemBlock!!! 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); this.player.itemInWorldManager.interact(this.player, worldserver, itemstack, i, j, k, l);
} }
// CraftBukkit end
this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, worldserver)); this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, worldserver));
if (l == 0) { if (l == 0) {