From c1e9f567c841cc141fef9e4b90ebe2fea4df9b8f Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Tue, 18 Feb 2014 08:50:49 -0500 Subject: [PATCH] Fixed fluid channel on block activated --- .../archaic/channel/BlockChannel.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java b/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java index ffa71105..47bd237f 100644 --- a/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java +++ b/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java @@ -49,17 +49,14 @@ public class BlockChannel extends BlockFluidNetwork } @Override - public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float hitX, float hitY, float hitZ) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float hitX, float hitY, float hitZ) { TileEntity tile = world.getBlockTileEntity(x, y, z); - if (!world.isRemote) + if (!world.isRemote && tile instanceof TileChannel) { - if (!FluidUtility.playerActivatedFluidItem(world, x, y, z, entityplayer, side)) + if (!((TileChannel) tile).onActivated(entityplayer)) { - if (tile instanceof TileChannel) - { - return ((TileChannel) tile).onActivated(entityplayer); - } + return FluidUtility.playerActivatedFluidItem(world, x, y, z, entityplayer, side); } } return true;