diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemRedstone.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemRedstone.java | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/main/java/net/minecraft/server/ItemRedstone.java b/src/main/java/net/minecraft/server/ItemRedstone.java index c9f91dae..dee5f0d1 100644 --- a/src/main/java/net/minecraft/server/ItemRedstone.java +++ b/src/main/java/net/minecraft/server/ItemRedstone.java @@ -1,7 +1,5 @@ package net.minecraft.server; -import org.bukkit.craftbukkit.block.CraftBlockState; // CraftBukkit - public class ItemRedstone extends Item { public ItemRedstone(int i) { @@ -10,8 +8,7 @@ public class ItemRedstone extends Item { } public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) { - int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit - + final int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit if (world.getTypeId(i, j, k) != Block.SNOW.id) { if (l == 0) { --j; @@ -47,22 +44,12 @@ public class ItemRedstone extends Item { } else { if (Block.REDSTONE_WIRE.canPlace(world, i, j, k)) { // CraftBukkit start - CraftBlockState blockState = CraftBlockState.getBlockState(world, i, j, k); - - world.suppressPhysics = true; - world.setRawTypeId(i, j, k, Block.REDSTONE_WIRE.id); // We update after the event - - org.bukkit.event.block.BlockPlaceEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockState, clickedX, clickedY, clickedZ); - blockState.update(true); - - world.suppressPhysics = false; - if (event.isCancelled() || !event.canBuild()) { + // --itemstack.count; + // world.setTypeId(i, j, k, Block.REDSTONE_WIRE.id); + if (!ItemBlock.processBlockPlace(world, entityhuman, itemstack, i, j, k, Block.REDSTONE_WIRE.id, 0, clickedX, clickedY, clickedZ)) { return false; } // CraftBukkit end - - --itemstack.count; - world.setTypeId(i, j, k, Block.REDSTONE_WIRE.id); } return true; |