diff options
| author | Technus <daniel112092@gmail.com> | 2017-05-30 12:15:10 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-05-30 12:15:10 +0200 |
| commit | 9398d2cd74e9cbae1978c14b21e8728f25bf0cfa (patch) | |
| tree | 28eec47989ec8ccf167dca7e0729571582acca1d /src/main/java/gregtech/api/metatileentity | |
| parent | 2c4a948a4938260fd1c2a393bf92b852c7a33e02 (diff) | |
| download | GT5-Unofficial-9398d2cd74e9cbae1978c14b21e8728f25bf0cfa.tar.gz GT5-Unofficial-9398d2cd74e9cbae1978c14b21e8728f25bf0cfa.tar.bz2 GT5-Unofficial-9398d2cd74e9cbae1978c14b21e8728f25bf0cfa.zip | |
Minor cleanup
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 8cbffc0cf2..89c75a0b4c 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -266,13 +266,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { } addOutput(tStack); } - if (mOutputFluids != null && mOutputFluids.length == 1) { - for (FluidStack tStack : mOutputFluids) - if (tStack != null) { - addOutput(tStack); - } - } else if (mOutputFluids != null && mOutputFluids.length > 1) { - addFluidOutputs(mOutputFluids); + if(mOutputFluids!=null) { + if (mOutputFluids.length == 1) { + for (FluidStack tStack : mOutputFluids) + if (tStack != null) { + addOutput(tStack); + } + } else if (mOutputFluids.length > 1) { + addFluidOutputs(mOutputFluids); + } } mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000))); mOutputItems = null; @@ -607,13 +609,13 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { return false; } - private void addFluidOutputs(FluidStack[] mOutputFluids2) { - for (int i = 0; i < mOutputFluids2.length; i++) { - if (mOutputHatches.size() > i && mOutputHatches.get(i) != null && mOutputFluids2[i] != null && isValidMetaTileEntity(mOutputHatches.get(i))) { - mOutputHatches.get(i).fill(mOutputFluids2[i], true); + private void addFluidOutputs(FluidStack[] mOutputFluids) { + int min=mOutputFluids.length>mOutputHatches.size()?mOutputHatches.size():mOutputFluids.length; + for (int i = 0; i < min; ++i) { + if (this.mOutputHatches.get(i) != null && mOutputFluids[i] != null && isValidMetaTileEntity(this.mOutputHatches.get(i))) { + this.mOutputHatches.get(i).fill(mOutputFluids[i], true); } } - } public boolean depleteInput(FluidStack aLiquid) { |