From 4adb6554c2a1413df63153c3727e3042855acfac Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Mon, 27 Jun 2016 17:12:02 -0700 Subject: [PATCH 1/3] Update GT_MetaTileEntity_AdvMiner2.java --- .../machines/multi/GT_MetaTileEntity_AdvMiner2.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java index 77fe8331..0e9739d8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java @@ -134,8 +134,9 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas ArrayList tDrops = new ArrayList(); if (!mMineList.isEmpty()) { Block tMineBlock = null; + ChunkPosition mle; while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) { - ChunkPosition mle = mMineList.get(0); + mle = mMineList.get(0); mMineList.remove(0); tMineBlock = getBaseMetaTileEntity().getBlockOffset(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ); } From 9be4d8c27020cab7cc3525062c296e1f6526d004 Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Mon, 27 Jun 2016 17:20:47 -0700 Subject: [PATCH 2/3] Update GT_MetaTileEntity_AdvMiner2.java --- .../multi/GT_MetaTileEntity_AdvMiner2.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java index 0e9739d8..2a4d9555 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java @@ -132,14 +132,15 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas } } ArrayList tDrops = new ArrayList(); - if (!mMineList.isEmpty()) { - Block tMineBlock = null; - ChunkPosition mle; - while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) { - mle = mMineList.get(0); - mMineList.remove(0); - tMineBlock = getBaseMetaTileEntity().getBlockOffset(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ); - } + Block tMineBlock = null; + ChunkPosition mle; + while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) { + mle = mMineList.get(0); + mMineList.remove(0); + tMineBlock = getBaseMetaTileEntity().getBlockOffset(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ); + } + + if (tMineBlock!=null && tMineBlock!=Blocks.air) { int metadata = getBaseMetaTileEntity().getMetaIDOffset(mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ); boolean silkTouch = tMineBlock.canSilkHarvest(getBaseMetaTileEntity().getWorld(), null, mle.chunkPosX, mle.chunkPosY, mle.chunkPosZ, metadata); if (silkTouch){ From fcb685693e09abbf83c46bc32ab12538dba874ea Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Mon, 27 Jun 2016 17:28:18 -0700 Subject: [PATCH 3/3] Update GT_MetaTileEntity_AdvMiner2.java --- .../machines/multi/GT_MetaTileEntity_AdvMiner2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java index 2a4d9555..9fc7bafc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java @@ -133,7 +133,7 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas } ArrayList tDrops = new ArrayList(); Block tMineBlock = null; - ChunkPosition mle; + ChunkPosition mle = null;; while ((tMineBlock==null || tMineBlock == Blocks.air) && !mMineList.isEmpty()) { mle = mMineList.get(0); mMineList.remove(0);