3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-17 05:20:05 +01:00

Revert "Improved our handling of player interactions."

This reverts commit b4d325e0efe44bc74e69371fb11e7c3e1124b2a3.
Dieser Commit ist enthalten in:
EvilSeph 2012-01-10 22:19:23 -05:00
Ursprung bff4d0f696
Commit 194f54a90e

Datei anzeigen

@ -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) {