aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-12-02 16:32:39 +0100
committerGitHub <noreply@github.com>2021-12-02 16:32:39 +0100
commit8b09faf06297ef2d5438032f3f51a71c34362a5c (patch)
tree0a9abe74a5c735db95f73d811173908602c4a018 /src/main/java/gregtech
parent9ca59dd58d42e5cb6d6f47c3318e3f443d72e646 (diff)
parent16cb3af7ab14fe6718c9bbfc9ec37fa80a2972a3 (diff)
downloadGT5-Unofficial-8b09faf06297ef2d5438032f3f51a71c34362a5c.tar.gz
GT5-Unofficial-8b09faf06297ef2d5438032f3f51a71c34362a5c.tar.bz2
GT5-Unofficial-8b09faf06297ef2d5438032f3f51a71c34362a5c.zip
Merge pull request #770 from GTNewHorizons/patch-assline
Fix assline NPE
Diffstat (limited to 'src/main/java/gregtech')
-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)) {