aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/multi
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-13 23:40:50 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-13 23:40:50 +0100
commit1c195f5aab22c23aed4df944e49631e62312bd8b (patch)
tree93463143891c7c18365d3ce94fbe1e81be470d1f /src/main/java/gregtech/common/tileentities/machines/multi
parentccc7a1873918bd337290dc982441f76dbef6060b (diff)
parent55133748f138fef56973ee7f670da9d353cbfc73 (diff)
downloadGT5-Unofficial-1c195f5aab22c23aed4df944e49631e62312bd8b.tar.gz
GT5-Unofficial-1c195f5aab22c23aed4df944e49631e62312bd8b.tar.bz2
GT5-Unofficial-1c195f5aab22c23aed4df944e49631e62312bd8b.zip
Merge branch 'refs/heads/Blood-Asp/experimental' into Bugfixes
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 370ee1819d..af8247d4b8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -159,6 +159,7 @@ public class GT_MetaTileEntity_AssemblyLine
tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 1, i);
if (!addEnergyInputToMachineList(tTileEntity, 16)){
+ if (i==0) return false;
if (aBaseMetaTileEntity.getBlockOffset(xDir, 1, i) != GregTech_API.sBlockCasings2) {return false;}
if (aBaseMetaTileEntity.getMetaIDOffset(xDir, 1, i) != 0) {return false;}
}
@@ -193,6 +194,7 @@ public class GT_MetaTileEntity_AssemblyLine
tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, 1, zDir);
if (!addEnergyInputToMachineList(tTileEntity, 16)){
+ if (i==0) return false;
if (aBaseMetaTileEntity.getBlockOffset(i, 1, zDir) != GregTech_API.sBlockCasings2) {return false;}
if (aBaseMetaTileEntity.getMetaIDOffset(i, 1, zDir) != 0) {return false;}
}