diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-03-21 00:25:26 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-03-21 00:31:13 +0100 |
commit | 324efa8224818aa04402203b1ccbb9839b44061e (patch) | |
tree | 8f5550f37a671bf2bce48f318354e518570bb97b /src/main/java/net/minecraft/server/ItemBlock.java | |
parent | 0d2dc3902c1341be9bb1c51ab7e2be1a925788e3 (diff) | |
download | craftbukkit-324efa8224818aa04402203b1ccbb9839b44061e.tar craftbukkit-324efa8224818aa04402203b1ccbb9839b44061e.tar.gz craftbukkit-324efa8224818aa04402203b1ccbb9839b44061e.tar.lz craftbukkit-324efa8224818aa04402203b1ccbb9839b44061e.tar.xz craftbukkit-324efa8224818aa04402203b1ccbb9839b44061e.zip |
Fix BlockPlace
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemBlock.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemBlock.java | 53 |
1 files changed, 11 insertions, 42 deletions
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index e70dfa9d..a7eb4f22 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -1,13 +1,11 @@ package net.minecraft.server; // CraftBukkit start +import org.bukkit.Material; import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; -import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.CraftBlockState; -import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.entity.Player; -import org.bukkit.event.Event.Type; +import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.block.BlockPlaceEvent; // CraftBukkit end @@ -22,14 +20,7 @@ public class ItemBlock extends Item { } public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l) { - // CraftBukkit start -- Bail if we have nothing of the item in hand - if (itemstack.count == 0) { - return false; - } - - CraftBlock blockClicked = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k); - BlockFace faceClicked = CraftBlock.notchToBlockFace(l); - // CraftBukkit end + int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit; if (world.getTypeId(i, j, k) == Block.SNOW.id) { l = 0; @@ -62,23 +53,16 @@ public class ItemBlock extends Item { if (itemstack.count == 0) { return false; } else { - // CraftBukkit start - /* We store the old data so we can undo it. Snow(78) and half-steps(44) are special in that they replace the block itself, - * rather than the block touching the face we clicked on. - */ - int typeId = blockClicked.getTypeId(); - org.bukkit.block.Block placedBlock = blockClicked.getFace(faceClicked); - - if (typeId == Block.SNOW.id || (typeId == Block.STEP.id && itemstack.id == Block.STEP.id && faceClicked == BlockFace.UP)) - placedBlock = blockClicked; - - final BlockState replacedBlockState = new CraftBlockState(placedBlock); - // CraftBukkit end - if (world.a(this.a, i, j, k, false)) { Block block = Block.byId[this.a]; // 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) * @@ -90,22 +74,7 @@ public class ItemBlock extends Item { * replace this with. */ if (world.setTypeIdAndData(i, j, k, a, a(itemstack.h()))) { // <-- world.b does this to place the block - org.bukkit.Server server = ((WorldServer) world).getServer(); - Type eventType = Type.BLOCK_PLACE; - org.bukkit.inventory.ItemStack itemInHand = new CraftItemStack(itemstack); - Player thePlayer = (entityhuman == null) ? null : (Player) entityhuman.getBukkitEntity(); - - ChunkCoordinates chunkcoordinates = world.l(); - int spawnX = chunkcoordinates.a; - int spawnZ = chunkcoordinates.c; - - int distanceFromSpawn = (int) Math.max(Math.abs(i - spawnX), Math.abs(k - spawnZ)); - - // CraftBukkit Configurable spawn protection start - boolean canBuild = distanceFromSpawn > ((WorldServer) world).x.spawnProtection || thePlayer.isOp(); - - BlockPlaceEvent event = new BlockPlaceEvent(eventType, placedBlock, replacedBlockState, blockClicked, itemInHand, thePlayer, canBuild); - server.getPluginManager().callEvent(event); + BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, replacedBlockState, clickedX, clickedY, clickedZ, block); if (event.isCancelled() || !event.canBuild()) { // CraftBukkit Undo! @@ -116,7 +85,7 @@ public class ItemBlock extends Item { } else { - if (this.a == block.ICE.id) { + if (this.a == Block.ICE.id) { // Ice will explode if we set straight to 0 world.setTypeId(i, j, k, 20); } |