aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/multi
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2018-06-30 22:08:49 +0200
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2018-06-30 22:08:49 +0200
commit54e849e62dd4ebc9b7512c282cb19e8fa3002d73 (patch)
tree941d42f4f316ceddfb6cefc6182d9e8310ec15e6 /src/main/java/gregtech/common/tileentities/machines/multi
parent4c691b11f281af9802cd83e98ba0fcbb4b681946 (diff)
downloadGT5-Unofficial-54e849e62dd4ebc9b7512c282cb19e8fa3002d73.tar.gz
GT5-Unofficial-54e849e62dd4ebc9b7512c282cb19e8fa3002d73.tar.bz2
GT5-Unofficial-54e849e62dd4ebc9b7512c282cb19e8fa3002d73.zip
added some Main Branch PRs
https://github.com/Blood-Asp/GT5-Unofficial/pull/1468/ https://github.com/Blood-Asp/GT5-Unofficial/pull/1462 https://github.com/Blood-Asp/GT5-Unofficial/pull/1452/
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
index 09e7f236f4..4783a0936c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
@@ -122,6 +122,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu
if (isHasMiningPipes(maxPipes)) return;
ItemStack pipes = getStackInSlot(1);
+ if(pipes != null && !pipes.isItemEqual(miningPipe)) return;
for (ItemStack storedItem : getStoredInputs()) {
if (!storedItem.isItemEqual(miningPipe)) continue;