diff --git a/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java b/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java index 28ff9a78..7cdf4bcb 100644 --- a/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java @@ -17,7 +17,7 @@ public class NetherWartFarmer extends SeedFarmer { @Override public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!farm.isAir(bc)) { + if(!farm.isOpen(bc)) { return false; } World worldObj = farm.getWorldObj(); diff --git a/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java b/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java index bde9fd39..145337c7 100644 --- a/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java @@ -66,7 +66,7 @@ public class SeedFarmer implements IFarmerJoe { @Override public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!farm.isAir(bc)) { + if(!farm.isOpen(bc)) { return false; } if(requiresFarmland()) { diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 64f03815..67940616 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -178,8 +178,9 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt return worldObj.getBlockMetadata(bc.x, bc.y, bc.z); } - public boolean isAir(BlockCoord bc) { - return worldObj.isAirBlock(bc.x, bc.y, bc.z); + public boolean isOpen(BlockCoord bc) { + Block block = worldObj.getBlock(bc.x, bc.y, bc.z); + return block.isAir(worldObj, bc.x, bc.y, bc.z) || block.isReplaceable(worldObj, bc.x, bc.y, bc.z); } @Override @@ -229,11 +230,11 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt } - if(isAir(bc)) { + if(isOpen(bc)) { FarmersComune.instance.prepareBlock(this, bc, block, meta); block = worldObj.getBlock(bc.x, bc.y, bc.z); } - if(!isAir(bc) && hasPower()) { + if(!isOpen(bc) && hasPower()) { IHarvestResult harvest = FarmersComune.instance.harvestBlock(this, bc, block, meta); if(harvest != null) { if(harvest.getDrops() != null) { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java index 2fb9a4c2..48beaa9d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -77,7 +77,7 @@ public class PacketChannelList implements IMessage, IMessageHandler