diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemReed.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemReed.java | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/main/java/net/minecraft/server/ItemReed.java b/src/main/java/net/minecraft/server/ItemReed.java index f3a3c0e0..bdcc92b6 100644 --- a/src/main/java/net/minecraft/server/ItemReed.java +++ b/src/main/java/net/minecraft/server/ItemReed.java @@ -2,20 +2,19 @@ package net.minecraft.server; public class ItemReed extends Item { - private int id; + private Block block; - public ItemReed(int i, Block block) { - super(i); - this.id = block.id; + public ItemReed(Block block) { + this.block = block; } public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) { final int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit - int i1 = world.getTypeId(i, j, k); + Block block = world.getType(i, j, k); - if (i1 == Block.SNOW.id && (world.getData(i, j, k) & 7) < 1) { + if (block == Blocks.SNOW && (world.getData(i, j, k) & 7) < 1) { l = 1; - } else if (i1 != Block.VINE.id && i1 != Block.LONG_GRASS.id && i1 != Block.DEAD_BUSH.id) { + } else if (block != Blocks.VINE && block != Blocks.LONG_GRASS && block != Blocks.DEAD_BUSH) { if (l == 0) { --j; } @@ -46,24 +45,21 @@ public class ItemReed extends Item { } else if (itemstack.count == 0) { return false; } else { - if (world.mayPlace(this.id, i, j, k, false, l, (Entity) null, itemstack)) { - Block block = Block.byId[this.id]; - int j1 = block.getPlacedData(world, i, j, k, l, f, f1, f2, 0); - + if (world.mayPlace(this.block, i, j, k, false, l, (Entity) null, itemstack)) { + int i1 = this.block.getPlacedData(world, i, j, k, l, f, f1, f2, 0); // CraftBukkit start - Redirect to common handler - ItemBlock.processBlockPlace(world, entityhuman, itemstack, i, j, k, this.id, j1, clickedX, clickedY, clickedZ); + ItemBlock.processBlockPlace(world, entityhuman, itemstack, i, j, k, this.block, i1, clickedX, clickedY, clickedZ); /* - if (world.setTypeIdAndData(i, j, k, this.id, j1, 3)) { - if (world.getTypeId(i, j, k) == this.id) { - Block.byId[this.id].postPlace(world, i, j, k, entityhuman, itemstack); - Block.byId[this.id].postPlace(world, i, j, k, j1); + if (world.setTypeAndData(i, j, k, this.block, i1, 3)) { + if (world.getType(i, j, k) == this.block) { + this.block.postPlace(world, i, j, k, entityhuman, itemstack); + this.block.postPlace(world, i, j, k, i1); } - world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.getPlaceSound(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F); + world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.block.stepSound.getPlaceSound(), (this.block.stepSound.getVolume1() + 1.0F) / 2.0F, this.block.stepSound.getVolume2() * 0.8F); --itemstack.count; } - */ - // CraftBukkit end + // CraftBukkit end */ } return true; |