From 0c24f86a0974207d224cc873104fd14188e726d3 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Thu, 9 Jun 2011 02:52:37 -0400 Subject: [PATCH] Fixed redstone current being sent even if a BlockPlace was cancelled. --- src/main/java/net/minecraft/server/ItemRedstone.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/ItemRedstone.java b/src/main/java/net/minecraft/server/ItemRedstone.java index 631d93a761..4ef590c7f7 100644 --- a/src/main/java/net/minecraft/server/ItemRedstone.java +++ b/src/main/java/net/minecraft/server/ItemRedstone.java @@ -49,8 +49,6 @@ public class ItemRedstone extends Item { if (Block.REDSTONE_WIRE.canPlace(world, i, j, k)) { BlockState blockState = CraftBlockState.getBlockState(world, i, j, k); // CraftBukkit - world.setTypeId(i, j, k, Block.REDSTONE_WIRE.id); - // CraftBukkit start - redstone BlockPlaceEvent event = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockState, clickedX, clickedY, clickedZ, Block.REDSTONE_WIRE); @@ -58,6 +56,8 @@ public class ItemRedstone extends Item { event.getBlockPlaced().setTypeIdAndData(blockState.getTypeId(), blockState.getRawData(), false); return false; } + + world.setTypeId(i, j, k, Block.REDSTONE_WIRE.id); // CraftBukkit - Must take place after BlockPlaceEvent // CraftBukkit end --itemstack.count; // CraftBukkit - ORDER MATTERS