diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 256aa26b..a0edf506 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -149,6 +149,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileCraftingTile tg = this.getTileEntity( w, pos ); + if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() ) { if( Platform.isClient() ) @@ -160,7 +161,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock return true; } - return false; + return super.onBlockActivated( w, pos, state, p, hand, heldItem, side, hitX, hitY, hitZ ); } public enum CraftingUnitType diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java index 9ec06dd1..544685f9 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java @@ -107,6 +107,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock Platform.openGUI( p, tg, AEPartLocation.fromFacing( side ), GuiBridge.GUI_MAC ); return true; } - return false; + + return super.onBlockActivated( w, pos, state, p, hand, heldItem, side, hitX, hitY, hitZ ); } } diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index 4f8de823..00b23b92 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -47,6 +47,7 @@ import appeng.helpers.ICustomCollision; import appeng.tile.networking.TileWireless; import appeng.util.Platform; + public class BlockWireless extends AEBaseTileBlock implements ICustomCollision { @@ -63,7 +64,6 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision } } - public static final PropertyEnum STATE = PropertyEnum.create( "state", State.class ); public BlockWireless() @@ -113,13 +113,9 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision @Override public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { - if( player.isSneaking() ) - { - return false; - } - final TileWireless tg = this.getTileEntity( w, pos ); - if( tg != null ) + + if( tg != null && !player.isSneaking() ) { if( Platform.isServer() ) { @@ -127,7 +123,8 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision } return true; } - return false; + + return super.onBlockActivated( w, pos, state, player, hand, heldItem, side, hitX, hitY, hitZ ); } @Override