Fixed redstone current being sent even if a BlockPlace was cancelled.

This commit is contained in:
EvilSeph 2011-06-09 02:52:37 -04:00
parent 053e05dd37
commit 0c24f86a09

View File

@ -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