diff --git a/common/mekanism/common/miner/ThreadMinerSearch.java b/common/mekanism/common/miner/ThreadMinerSearch.java index a62e88dee..42939e0eb 100644 --- a/common/mekanism/common/miner/ThreadMinerSearch.java +++ b/common/mekanism/common/miner/ThreadMinerSearch.java @@ -43,6 +43,7 @@ public class ThreadMinerSearch extends Thread Coord4D coord = tileEntity.getStartingCoord(); int diameter = tileEntity.getDiameter(); int size = tileEntity.getTotalSize(); + ItemInfo info = new ItemInfo(0,0); for(int i = 0; i < size; i++) { @@ -70,12 +71,11 @@ public class ThreadMinerSearch extends Thread continue; } - int blockID = tileEntity.worldObj.getBlockId(x, y, z); - int meta = tileEntity.worldObj.getBlockMetadata(x, y, z); + info.id = tileEntity.worldObj.getBlockId(x, y, z); + info.meta = tileEntity.worldObj.getBlockMetadata(x, y, z); - if(blockID != 0 && blockID != Block.bedrock.blockID) + if(info.id != 0 && info.id != Block.bedrock.blockID) { - ItemInfo info = new ItemInfo(blockID, meta); boolean canFilter = false; if(acceptedItems.containsKey(info)) @@ -83,7 +83,7 @@ public class ThreadMinerSearch extends Thread canFilter = acceptedItems.get(info); } else { - ItemStack stack = new ItemStack(blockID, 1, meta); + ItemStack stack = new ItemStack(info.id, 1, info.meta); if(tileEntity.replaceStack != null && tileEntity.replaceStack.isItemEqual(stack)) { diff --git a/common/mekanism/common/tile/TileEntityDigitalMiner.java b/common/mekanism/common/tile/TileEntityDigitalMiner.java index 75b1633f8..52609367b 100644 --- a/common/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/common/mekanism/common/tile/TileEntityDigitalMiner.java @@ -167,7 +167,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(!coord.exists(worldObj)) { - next = index; + toRemove.add(index); + next = index + 1; continue; } @@ -177,7 +178,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(id == 0) { toRemove.add(index); - next = index; + next = index + 1; continue; } @@ -195,7 +196,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(inverse ? hasFilter : !hasFilter) { toRemove.add(index); - next = index; + next = index + 1; continue; }