tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan C. Brady 2014-02-20 21:59:49 -05:00
commit 28c3b2a088
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/mekanism/common/miner/ThreadMinerSearch.java
View file

@ -43,6 +43,7 @@ public class ThreadMinerSearch extends Thread
Coord4D coord = tileEntity.getStartingCoord(); Coord4D coord = tileEntity.getStartingCoord();
int diameter = tileEntity.getDiameter(); int diameter = tileEntity.getDiameter();
int size = tileEntity.getTotalSize(); int size = tileEntity.getTotalSize();
ItemInfo info = new ItemInfo(0,0);
for(int i = 0; i < size; i++) for(int i = 0; i < size; i++)
{ {
@ -70,12 +71,11 @@ public class ThreadMinerSearch extends Thread
continue; continue;
} }
int blockID = tileEntity.worldObj.getBlockId(x, y, z); info.id = tileEntity.worldObj.getBlockId(x, y, z);
int meta = tileEntity.worldObj.getBlockMetadata(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; boolean canFilter = false;
if(acceptedItems.containsKey(info)) if(acceptedItems.containsKey(info))
@ -83,7 +83,7 @@ public class ThreadMinerSearch extends Thread
canFilter = acceptedItems.get(info); canFilter = acceptedItems.get(info);
} }
else { 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)) if(tileEntity.replaceStack != null && tileEntity.replaceStack.isItemEqual(stack))
{ {

7
common/mekanism/common/tile/TileEntityDigitalMiner.java
View file

@ -167,7 +167,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
if(!coord.exists(worldObj)) if(!coord.exists(worldObj))
{ {
next = index; toRemove.add(index);
next = index + 1;
continue; continue;
} }
@ -177,7 +178,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
if(id == 0) if(id == 0)
{ {
toRemove.add(index); toRemove.add(index);
next = index; next = index + 1;
continue; continue;
} }
@ -195,7 +196,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
if(inverse ? hasFilter : !hasFilter) if(inverse ? hasFilter : !hasFilter)
{ {
toRemove.add(index); toRemove.add(index);
next = index; next = index + 1;
continue; continue;
} }