diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-02 14:02:36 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-02 14:02:36 +1000 |
| commit | 3fa1a63540b9bd279d6ac1c91e37c4eb29b024a1 (patch) | |
| tree | 5fb516914603b4560877de798b9751343420b937 | |
| parent | 47a2ec5babcab6c42d9c74370aca260838a25401 (diff) | |
| parent | e21a47f596f194253d17c4a85ab2e5e8b9a4f256 (diff) | |
| download | GT5-Unofficial-3fa1a63540b9bd279d6ac1c91e37c4eb29b024a1.tar.gz GT5-Unofficial-3fa1a63540b9bd279d6ac1c91e37c4eb29b024a1.tar.bz2 GT5-Unofficial-3fa1a63540b9bd279d6ac1c91e37c4eb29b024a1.zip | |
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index bea37c476f..2643b0e9dd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -172,6 +172,7 @@ GT_MetaTileEntity_MultiBlockBase { int slotsNeeded = aRecipe.mOutputs.length; for (final ItemStack tRecipeOutput: aRecipe.mOutputs) { + if (tRecipeOutput == null) continue; int amount = tRecipeOutput.stackSize * aParallelRecipes; for (final ItemStack tBusStack : tBusStacks) { if (GT_Utility.areStacksEqual(tBusStack, tRecipeOutput)) { @@ -187,6 +188,7 @@ GT_MetaTileEntity_MultiBlockBase { // For each output fluid, make sure an output hatch can accept it. for (FluidStack tRecipeFluid: aRecipe.mFluidOutputs) { + if (tRecipeFluid == null) continue; boolean tCanBufferFluid = false; int tRecipeAmount = tRecipeFluid.amount; for (final GT_MetaTileEntity_Hatch_Output tHatch : this.mOutputHatches) { @@ -425,7 +427,7 @@ GT_MetaTileEntity_MultiBlockBase { } if (aBaseMetaTileEntity.isServerSide()) { - if (mUpdate == 0 || --this.mStartUpCheck == 0) { + if (mUpdate == 0 || this.mStartUpCheck == 0) { this.mChargeHatches.clear(); this.mDischargeHatches.clear(); } |