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

miner fix

Browse source
This commit is contained in:
drpepper240 2014-07-09 07:54:18 +04:00
parent a5b99b55e3
commit 88f12c3a4d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cr0s/WarpDrive/TileEntityMiningLaser.java
View file

@ -129,10 +129,10 @@ public class TileEntityMiningLaser extends TileEntity implements IPeripheral, IG
}
else
{
if (++delayTicksMine > WarpDriveConfig.i.ML_MINE_DELAY)
if (++delayTicksMine > WarpDriveConfig.i.ML_MINE_DELAY && isMining)
{
delayTicksMine = 0;
while(valuableIndex < valuablesInLayer.size())
while(valuableIndex < valuablesInLayer.size() && isMining)
{
Vector3 valuable = valuablesInLayer.get(valuableIndex++);
int blockID = worldObj.getBlockId(valuable.intX(), valuable.intY(), valuable.intZ());
@ -157,12 +157,10 @@ public class TileEntityMiningLaser extends TileEntity implements IPeripheral, IG
if (blockID == 0)
return false;
if (Block.blocksList[blockID] != null)
return ( (blockID == WarpDriveConfig.i.GT_Granite ||
blockID == WarpDriveConfig.i.GT_Ores ||
blockID == WarpDriveConfig.i.iridiumID ||
return ( (WarpDriveConfig.i.MinerOres.contains(blockID) ||
Block.blocksList[blockID].blockHardness <= Block.obsidian.blockHardness) &&
blockID !=WarpDriveConfig.i.MFFS_Field &&
blockID != Block.bedrock.blockID ); //TODO maybe change to WarpDriveConfig.i.MinerOres instead?
blockID != Block.bedrock.blockID );
else
return (blockID != WarpDriveConfig.i.MFFS_Field && blockID != Block.bedrock.blockID);
}
@ -273,7 +271,8 @@ public class TileEntityMiningLaser extends TileEntity implements IPeripheral, IG
{
if (inventory == null || itemStackSource == null)
{
return 0; //TODO stop operation/raise error/etc instead of losing valuables silently (i.e. no chests and with AE problems)
isMining = false; //stopping operation
return 0;
}
int transferred = 0;