From 7cb51ae461815bfd767aa0bf64f8ff075de5624d Mon Sep 17 00:00:00 2001
From: Techlone <techlone.mc@gmail.com>
Date: Mon, 5 Jun 2017 17:14:24 +0500
Subject: fix OsmiridiumCasing recipe in Assembler fix ODP changing state when
 the tip meets itself fix cleaning of oreBlockPositions when a mining column
 was broken

---
 .../machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/common/tileentities/machines/multi')

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
index 729a133766..f25d2d304c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
@@ -94,10 +94,12 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     @Override
     public boolean checkRecipe(ItemStack aStack) {
         setElectricityStats();
+        int oldYHead = yHead;
         if (!checkPipesAndSetYHead() || !isEnergyEnough()) {
             stopMachine();
             return false;
         }
+        if (yHead != oldYHead) oreBlockPositions.clear();
         if (isPickingPipes) {
             if (tryPickPipe()) {
                 mOutputItems = new ItemStack[] {GT_Utility.copyAmount(1, miningPipe)};
@@ -286,7 +288,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         if (yHead <= 0) return false;
         if (checkBlockAndMeta(xCenter, yHead - 1, zCenter, Blocks.bedrock, W)) return false;
 
-        if (!getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead - 1, zCenter, miningPipeTipBlock)) return false;
+        getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead - 1, zCenter, miningPipeTipBlock);
         if (yHead != yDrill) getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead, zCenter, miningPipeBlock);
 
         getBaseMetaTileEntity().decrStackSize(1, 1);
@@ -350,7 +352,6 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         if (checkBlockAndMeta(xCenter, yHead, zCenter, miningPipeTipBlock, W) || ++yHead == yDrill) return true;
         //pipe column is broken - try fix
         getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead, zCenter, miningPipeTipBlock);
-        oreBlockPositions.clear();
         return true;
     }
 
-- 
cgit