diff options
| author | Technus <daniel112092@gmail.com> | 2017-08-03 22:47:12 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-08-03 22:47:12 +0200 |
| commit | 32fe75001aa6c8491432bdf9c8d19c1e5449b4bf (patch) | |
| tree | fa15666cb7dd881164bd9c150e468a37ad744c4b /src/main/java/gregtech/common/tileentities/machines | |
| parent | 4a66c8f221f0e2cdb7a69ffccc5eb44d811d0358 (diff) | |
| parent | 77161c7daf90485265fc6e948ca1159f0c0e7fd8 (diff) | |
| download | GT5-Unofficial-32fe75001aa6c8491432bdf9c8d19c1e5449b4bf.tar.gz GT5-Unofficial-32fe75001aa6c8491432bdf9c8d19c1e5449b4bf.tar.bz2 GT5-Unofficial-32fe75001aa6c8491432bdf9c8d19c1e5449b4bf.zip | |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java | 8 |
1 files changed, 6 insertions, 2 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..bd1164ffb3 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(); @@ -111,7 +115,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu long voltage = getMaxInputVoltage(); byte tier = (byte) Math.max(1, GT_Utility.getTier(voltage)); GT_Recipe recipe = GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.findRecipe(getBaseMetaTileEntity(), false, - gregtech.api.enums.GT_Values.V[tier], fluids, inputs); + false, gregtech.api.enums.GT_Values.V[tier], fluids, inputs); if (recipe != null && recipe.isRecipeInputEqual(true, fluids, inputs)) { this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; |