From 88f12c3a4d6f1fa7dfeb06514d72a7dd32f5bfe8 Mon Sep 17 00:00:00 2001
From: drpepper240 <drpepper240@users.noreply.github.com>
Date: Wed, 9 Jul 2014 07:54:18 +0400
Subject: [PATCH] miner fix

---
 src/cr0s/WarpDrive/TileEntityMiningLaser.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/cr0s/WarpDrive/TileEntityMiningLaser.java b/src/cr0s/WarpDrive/TileEntityMiningLaser.java
index f8babb47..6f44e201 100644
--- a/src/cr0s/WarpDrive/TileEntityMiningLaser.java
+++ b/src/cr0s/WarpDrive/TileEntityMiningLaser.java
@@ -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;