aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-12-02 16:50:28 +0100
committerGitHub <noreply@github.com>2021-12-02 16:50:28 +0100
commit03b6fb248b1a20b9ccce7ac4da4c1a76875fa966 (patch)
treed54bf96e56507a69e3a67e155b55352543ad9444
parent3b03b927d52a50477122714518051b937f3367b5 (diff)
parent8b09faf06297ef2d5438032f3f51a71c34362a5c (diff)
downloadGT5-Unofficial-03b6fb248b1a20b9ccce7ac4da4c1a76875fa966.tar.gz
GT5-Unofficial-03b6fb248b1a20b9ccce7ac4da4c1a76875fa966.tar.bz2
GT5-Unofficial-03b6fb248b1a20b9ccce7ac4da4c1a76875fa966.zip
Merge pull request #772 from GTNewHorizons/experimental
the fix went to wrong branch
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java5
1 files changed, 4 insertions, 1 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 ac152ac09d..41475fd600 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
@@ -175,7 +175,10 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu
nextDataStick:
for (ItemStack tDataStick : tDataStickList) {
- GT_Recipe_AssemblyLine aFoundRecipe = GT_AssemblyLineUtils.findAssemblyLineRecipeFromDataStick(tDataStick);
+ GT_Recipe_AssemblyLine aFoundRecipe = GT_AssemblyLineUtils.findAssemblyLineRecipeFromDataStick(tDataStick);
+
+ if (aFoundRecipe == null)
+ continue;
// Check if the recipe on the data stick is the current recipe for it's given output, if not we update it and continue to next.
if (!GT_AssemblyLineUtils.processDataStick(tDataStick)) {