aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-08-02 23:06:17 +0200
committerDream-Master <dream-master@gmx.net>2017-08-02 23:06:17 +0200
commit71ff139f3ae2f9988897a8ce18656d370d8eb0d7 (patch)
tree922a3b7d7bc15648e3da3004bad4e3c7a47b3a71 /src/main/java/gregtech/common/tileentities
parent9f769ded41914aabd4fa0c511a07e0f62f5cf98d (diff)
parentd5dfab598e52a922f7d7692e6b867217ff5b1c83 (diff)
downloadGT5-Unofficial-71ff139f3ae2f9988897a8ce18656d370d8eb0d7.tar.gz
GT5-Unofficial-71ff139f3ae2f9988897a8ce18656d370d8eb0d7.tar.bz2
GT5-Unofficial-71ff139f3ae2f9988897a8ce18656d370d8eb0d7.zip
Merge branch 'HP-Wrough-Iron-Update' into experimental
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
index c8f5a4aa8a..cbbf1adddd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java
@@ -86,7 +86,11 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu
}
}
}
- tInputList.add(mInventory[1]);
+ if (mInventory[1] != null) {
+ tInputList.add(mInventory[1]);
+ } else {
+ tInputList.add(GT_Utility.getIntegratedCircuit(0));
+ }
ItemStack[] inputs = tInputList.toArray(new ItemStack[tInputList.size()]);
ArrayList<FluidStack> tFluidList = getStoredFluids();