Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed NPE in laser tree farm when on LUA farming script

Browse source
This commit is contained in:
Unknown 2019-08-08 10:53:38 +02:00 • committed by unknown
parent ab3cba9748
commit 5442f03abc
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/cr0s/warpdrive/block/collection/TileEntityLaserTreeFarm.java
View file

@ -89,9 +89,9 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
private int tickCurrentTask = 0; private int tickCurrentTask = 0;
private ArrayList<BlockPos> blockPosSoils; private ArrayList<BlockPos> blockPosSoils = new ArrayList<>(0);
private int indexSoil = 0; private int indexSoil = 0;
private ArrayList<BlockStatePos> blockPosValuables; private ArrayList<BlockStatePos> blockPosValuables = new ArrayList<>(0);
private int indexValuable = 0; private int indexValuable = 0;
public TileEntityLaserTreeFarm() { public TileEntityLaserTreeFarm() {
@ -243,7 +243,7 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
WarpDrive.logger.debug("Scanning done"); WarpDrive.logger.debug("Scanning done");
} }
if (blockPosSoils != null && !blockPosSoils.isEmpty() && !InventoryWrapper.getConnectedInventories(world, pos).isEmpty()) { if (!blockPosSoils.isEmpty() && !InventoryWrapper.getConnectedInventories(world, pos).isEmpty()) {
world.playSound(null, pos, SoundEvents.LASER_HIGH, SoundCategory.BLOCKS, 4F, 1F); world.playSound(null, pos, SoundEvents.LASER_HIGH, SoundCategory.BLOCKS, 4F, 1F);
currentState = STATE_PLANTING; currentState = STATE_PLANTING;
tickCurrentTask = WarpDriveConfig.TREE_FARM_PLANT_DELAY_TICKS; tickCurrentTask = WarpDriveConfig.TREE_FARM_PLANT_DELAY_TICKS;
@ -277,7 +277,7 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
} }
// planting done, move to harvesting // planting done, move to harvesting
if (blockPosSoils == null || indexSoil >= blockPosSoils.size()) { if (indexSoil >= blockPosSoils.size()) {
currentState = STATE_HARVESTING; currentState = STATE_HARVESTING;
tickCurrentTask = WarpDriveConfig.TREE_FARM_HARVEST_LOG_DELAY_TICKS; tickCurrentTask = WarpDriveConfig.TREE_FARM_HARVEST_LOG_DELAY_TICKS;
return; return;
@ -317,7 +317,7 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
} }
// harvesting done, back to scanning // harvesting done, back to scanning
if (blockPosValuables == null || indexValuable >= blockPosValuables.size()) { if (indexValuable >= blockPosValuables.size()) {
currentState = STATE_WARMING_UP; currentState = STATE_WARMING_UP;
tickCurrentTask = 0; tickCurrentTask = 0;
return; return;
@ -606,8 +606,8 @@ public class TileEntityLaserTreeFarm extends TileEntityAbstractMiner {
WarpDrive.logger.info(String.format("Calculation initiated for %s", WarpDrive.logger.info(String.format("Calculation initiated for %s",
this)); this));
} }
blockPosSoils = null; blockPosSoils = new ArrayList<>(0);
blockPosValuables = null; blockPosValuables = new ArrayList<>(0);
new ThreadCalculation(this).start(); new ThreadCalculation(this).start();
} }