diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemDoor.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemDoor.java | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/main/java/net/minecraft/server/ItemDoor.java b/src/main/java/net/minecraft/server/ItemDoor.java index 708fcf8e..29dc1330 100644 --- a/src/main/java/net/minecraft/server/ItemDoor.java +++ b/src/main/java/net/minecraft/server/ItemDoor.java @@ -4,8 +4,7 @@ public class ItemDoor extends Item { private Material a; - public ItemDoor(int i, Material material) { - super(i); + public ItemDoor(Material material) { this.a = material; this.maxStackSize = 1; this.a(CreativeModeTab.d); @@ -20,9 +19,9 @@ public class ItemDoor extends Item { Block block; if (this.a == Material.WOOD) { - block = Block.WOODEN_DOOR; + block = Blocks.WOODEN_DOOR; } else { - block = Block.IRON_DOOR_BLOCK; + block = Blocks.IRON_DOOR_BLOCK; } if (entityhuman.a(i, j, k, l, itemstack) && entityhuman.a(i, j + 1, k, l, itemstack)) { @@ -72,10 +71,10 @@ public class ItemDoor extends Item { b0 = 1; } - int i1 = (world.u(i - b0, j, k - b1) ? 1 : 0) + (world.u(i - b0, j + 1, k - b1) ? 1 : 0); - int j1 = (world.u(i + b0, j, k + b1) ? 1 : 0) + (world.u(i + b0, j + 1, k + b1) ? 1 : 0); - boolean flag = world.getTypeId(i - b0, j, k - b1) == block.id || world.getTypeId(i - b0, j + 1, k - b1) == block.id; - boolean flag1 = world.getTypeId(i + b0, j, k + b1) == block.id || world.getTypeId(i + b0, j + 1, k + b1) == block.id; + int i1 = (world.getType(i - b0, j, k - b1).r() ? 1 : 0) + (world.getType(i - b0, j + 1, k - b1).r() ? 1 : 0); + int j1 = (world.getType(i + b0, j, k + b1).r() ? 1 : 0) + (world.getType(i + b0, j + 1, k + b1).r() ? 1 : 0); + boolean flag = world.getType(i - b0, j, k - b1) == block || world.getType(i - b0, j + 1, k - b1) == block; + boolean flag1 = world.getType(i + b0, j, k + b1) == block || world.getType(i + b0, j + 1, k + b1) == block; boolean flag2 = false; if (flag && !flag1) { @@ -86,22 +85,22 @@ public class ItemDoor extends Item { // CraftBukkit start if (entityhuman != null) { - if (!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, block.id, l, clickedX, clickedY, clickedZ)) { - ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet53BlockChange(i, j + 1, k, world)); + if (!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, block, l, clickedX, clickedY, clickedZ)) { + ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(i, j + 1, k, world)); return false; } - if (world.getTypeId(i, j, k) != block.id) { - ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet53BlockChange(i, j + 1, k, world)); + if (world.getType(i, j, k) != block) { + ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(i, j + 1, k, world)); return true; } } else { - world.setTypeIdAndData(i, j, k, block.id, l, 2); + world.setTypeAndData(i, j, k, block, l, 2); } // CraftBukkit end - world.setTypeIdAndData(i, j + 1, k, block.id, 8 | (flag2 ? 1 : 0), 2); - world.applyPhysics(i, j, k, block.id); - world.applyPhysics(i, j + 1, k, block.id); + world.setTypeAndData(i, j + 1, k, block, 8 | (flag2 ? 1 : 0), 2); + world.applyPhysics(i, j, k, block); + world.applyPhysics(i, j + 1, k, block); return true; // CraftBukkit } } |