Fix #1342 Crash when giving multifarm control a redstone signal

This commit is contained in:
mezz committed 2016-07-03 20:59:26 -07:00
1 parent fb01d3ffaa
commit 46eb29cf28
3 files changed
+27 -32

No files matched your search

@@ -192,8 +192,7 @@ public class BlockFarm extends BlockStructure {
@Override
public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
IBlockState blockState = world.getBlockState(pos);
return blockState.getValue(META) == EnumFarmBlockType.CONTROL;
return state.getValue(META) == EnumFarmBlockType.CONTROL;
}
public ItemStack get(EnumFarmBlockType type, int amount) {
@@ -483,11 +483,6 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
continue;
}
// Allow listeners to cancel this cycle.
if (isCycleCanceledByListeners(logic, farmSide, farmListeners)) {
continue;
}
// Always try to collect windfall.
if (collectWindfall(logic)) {
farmWorkStatus.didWork = true;
@@ -504,7 +499,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
harvestProvider = logic;
}
} else if (stage == Stage.CULTIVATE) {
farmWorkStatus = cultivateTargets(farmWorkStatus, farmTargets, logic);
farmWorkStatus = cultivateTargets(farmWorkStatus, farmTargets, logic, farmSide);
}
if (farmWorkStatus.didWork) {
@@ -622,31 +617,37 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
private static class FarmWorkStatus {
public boolean didWork = false;
public boolean hasFarmland = false;
public boolean hasFertilizer = false;
public boolean hasLiquid = false;
public boolean hasFertilizer = true;
public boolean hasLiquid = true;
}
private FarmWorkStatus cultivateTargets(FarmWorkStatus farmWorkStatus, List<FarmTarget> farmTargets, IFarmLogic logic) {
float hydrationModifier = hydrationManager.getHydrationModifier();
final int fertilizerConsumption = logic.getFertilizerConsumption();
int liquidConsumption = logic.getWaterConsumption(hydrationModifier);
FluidStack liquid = new FluidStack(FluidRegistry.WATER, liquidConsumption);
private FarmWorkStatus cultivateTargets(FarmWorkStatus farmWorkStatus, List<FarmTarget> farmTargets, IFarmLogic logic, FarmDirection farmSide) {
boolean hasFarmland = false;
if (farmTargets != null) {
for (FarmTarget target : farmTargets) {
if (target.getExtent() <= 0) {
break;
} else {
if (target.getExtent() > 0) {
hasFarmland = true;
farmWorkStatus.hasFarmland = true;
break;
}
}
}
if (hasFarmland && !isCycleCanceledByListeners(logic, farmSide, farmListeners)) {
final float hydrationModifier = hydrationManager.getHydrationModifier();
final int fertilizerConsumption = logic.getFertilizerConsumption();
final int liquidConsumption = logic.getWaterConsumption(hydrationModifier);
final FluidStack liquid = new FluidStack(FluidRegistry.WATER, liquidConsumption);
for (FarmTarget target : farmTargets) {
// Check fertilizer and water
if (!fertilizerManager.hasFertilizer(fertilizerConsumption)) {
farmWorkStatus.hasFertilizer = false;
continue;
}
if (liquid.amount > 0 && !hasLiquid(liquid)) {
farmWorkStatus.hasLiquid = false;
continue;
}
@@ -660,9 +661,6 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
}
}
farmWorkStatus.hasLiquid = liquid.amount <= 0 || hasLiquid(liquid);
farmWorkStatus.hasFertilizer = fertilizerManager.hasFertilizer(fertilizerConsumption);
return farmWorkStatus;
}
@@ -10,6 +10,8 @@
******************************************************************************/
package forestry.farming.tiles;
import forestry.farming.blocks.BlockFarm;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -42,15 +44,11 @@ public class TileFarmControl extends TileFarm implements IFarmComponent.Listener
@Override
public boolean cancelTask(IFarmLogic logic, FarmDirection direction) {
return hasRedstoneSignal(direction.getFacing()) || hasRedstoneSignal(EnumFacing.UP) || hasRedstoneSignal(EnumFacing.DOWN);
}
private boolean hasRedstoneSignal(EnumFacing direction) {
BlockPos side = tile.getPos().offset(direction);
EnumFacing dir = direction.getOpposite();
World world = tile.getWorld();
return world.getRedstonePower(side, dir) > 0 || world.getStrongPower(side, dir) > 0;
BlockPos pos = tile.getPos();
EnumFacing facing = direction.getFacing();
World world = tile.getWorldObj();
IBlockState blockState = world.getBlockState(pos.offset(facing));
return !(blockState.getBlock() instanceof BlockFarm) && world.getRedstonePower(pos, facing) > 0;
}
}