From 483a878b8bcf1feb789cb5fd9374d0a060cc4d8a Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Wed, 20 Apr 2011 19:05:14 +0200 Subject: Update for 1.4_00_01 -- if you bypassed Bukkit, you will most likely break. --- src/main/java/net/minecraft/server/ItemBlock.java | 94 +++++++++++------------ 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'src/main/java/net/minecraft/server/ItemBlock.java') diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index fda82cf6..d70a880d 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -9,11 +9,11 @@ import org.bukkit.event.block.BlockPlaceEvent; public class ItemBlock extends Item { - private int a; + private int id; public ItemBlock(int i) { super(i); - this.a = i + 256; + this.id = i + 256; this.b(Block.byId[i + 256].a(2)); } @@ -50,64 +50,64 @@ public class ItemBlock extends Item { if (itemstack.count == 0) { return false; - } else { - if (world.a(this.a, i, j, k, false)) { - Block block = Block.byId[this.a]; + } else if (world.a(this.id, i, j, k, false)) { + Block block = Block.byId[this.id]; - // CraftBukkit start - This executes the placement of the block - BlockState replacedBlockState = CraftBlockState.getBlockState(world, i, j, k); + // CraftBukkit start - This executes the placement of the block + BlockState replacedBlockState = CraftBlockState.getBlockState(world, i, j, k); - // Special case the silly stepstone :'( - if (l == 1 && world.getTypeId(i, j - 1, k) == Block.STEP.id && itemstack.id == Block.STEP.id) { - replacedBlockState = CraftBlockState.getBlockState(world, i, j - 1, k); - } - /** - * @see net.minecraft.server.World#b(int i, int j, int k, int l, int i1) - * - * This replaces world.b(IIIII), we're doing this because we need to - * hook between the 'placement' and the informing to 'world' so we can - * sanely undo this. - * - * Whenever the call to 'world.b' changes we need to figure out again what to - * replace this with. - */ - if (world.setTypeIdAndData(i, j, k, a, a(itemstack.h()))) { // <-- world.b does this to place the block - BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, replacedBlockState, clickedX, clickedY, clickedZ, block); - - if (event.isCancelled() || !event.canBuild()) { - // CraftBukkit Undo! - - if ((this.a == Block.STEP.id) && (world.getTypeId(i, j - 1, k) == Block.DOUBLE_STEP.id) && (world.getTypeId(i, j, k) == 0)) { - // Half steps automatically set the block below to a double - world.setTypeId(i, j - 1, k, 44); - - } else { - - if (this.a == Block.ICE.id) { - // Ice will explode if we set straight to 0 - world.setTypeId(i, j, k, 20); - } - - world.setTypeIdAndData(i, j, k, replacedBlockState.getTypeId(), replacedBlockState.getRawData()); - } + // Special case the silly stepstone :'( + if (l == 1 && world.getTypeId(i, j - 1, k) == Block.STEP.id && itemstack.id == Block.STEP.id) { + replacedBlockState = CraftBlockState.getBlockState(world, i, j - 1, k); + } + /** + * @see net.minecraft.server.World#setTypeIdAndData(int i, int j, int k, int l, int i1) + * + * This replaces world.setTypeIdAndData(IIIII), we're doing this because we need to + * hook between the 'placement' and the informing to 'world' so we can + * sanely undo this. + * + * Whenever the call to 'world.setTypeIdAndData' changes we need to figure out again what to + * replace this with. + */ + if (world.setRawTypeIdAndData(i, j, k, this.id, this.filterData(itemstack.getData()))) { // <-- world.setTypeIdAndData does this to place the block + BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, replacedBlockState, clickedX, clickedY, clickedZ, block); + + if (event.isCancelled() || !event.canBuild()) { + // CraftBukkit Undo! + + if ((this.id == Block.STEP.id) && (world.getTypeId(i, j - 1, k) == Block.DOUBLE_STEP.id) && (world.getTypeId(i, j, k) == 0)) { + // Half steps automatically set the block below to a double + world.setTypeId(i, j - 1, k, 44); } else { - world.f(i, j, k, a); // <-- world.b does this on success (tell the world) - Block.byId[this.a].d(world, i, j, k, l); - Block.byId[this.a].a(world, i, j, k, (EntityLiving) entityhuman); - world.a((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.c(), (block.stepSound.a() + 1.0F) / 2.0F, block.stepSound.b() * 0.8F); - --itemstack.count; + if (this.id == Block.ICE.id) { + // Ice will explode if we set straight to 0 + world.setTypeId(i, j, k, 20); + } + + world.setTypeIdAndData(i, j, k, replacedBlockState.getTypeId(), replacedBlockState.getRawData()); } - // CraftBukkit end + + } else { + world.update(i, j, k, this.id); // <-- world.setTypeIdAndData does this on success (tell the world) + + Block.byId[this.id].postPlace(world, i, j, k, l); + Block.byId[this.id].postPlace(world, i, j, k, entityhuman); + world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.getName(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F); + --itemstack.count; } + // CraftBukkit end } return true; + } else { + return false; } } public String a() { - return Block.byId[this.a].f(); + return Block.byId[this.id].f(); } } -- cgit v1.2.3