diff options
| author | Martin Robertz <dream-master@gmx.net> | 2020-10-12 16:30:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 16:30:57 +0200 |
| commit | bd62652a0cb26a55da43f05061cf419e748ed5db (patch) | |
| tree | 0eb42237998b467bef004df38dc6c541636866f5 /src/main/java/common | |
| parent | 42d4161dbaa7d5c5c2749e301a7337cabfb107d8 (diff) | |
| parent | 50d3ea937dce9394566e4d2c9cd9c5f8387923a9 (diff) | |
| download | GT5-Unofficial-bd62652a0cb26a55da43f05061cf419e748ed5db.tar.gz GT5-Unofficial-bd62652a0cb26a55da43f05061cf419e748ed5db.tar.bz2 GT5-Unofficial-bd62652a0cb26a55da43f05061cf419e748ed5db.zip | |
Merge pull request #3 from GTNewHorizons/fix-multie-fluidtank
fix voiding and made fluid pos static
Diffstat (limited to 'src/main/java/common')
| -rw-r--r-- | src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java index 0b8eec616b..894ad12415 100644 --- a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java @@ -158,8 +158,15 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { super.addOutput(tempStack); } else { - for(int i = 0; i < mfh.getDistinctFluids(); i++) { + int tDistinct = mfh.getDistinctFluids(); + int tDistinctCount = 0; + int tMaxDistinct = mfh.getMaxDistinctFluids(); + for(int i = 0; i < tMaxDistinct && tDistinctCount< tDistinct;i++) { final FluidStack storedFluidCopy = mfh.getFluidCopy(i); + if (storedFluidCopy == null) + continue; + tDistinctCount++; + storedFluidCopy.amount = 0; // Calculate how much capacity all available Output Hatches offer for (GT_MetaTileEntity_Hatch_Output outputHatch : super.mOutputHatches) { if (outputHatch.isFluidLocked() && outputHatch.getLockedFluidName().equals(storedFluidCopy.getUnlocalizedName())) { @@ -482,7 +489,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { runningCost = nbt.getInteger("runningCost"); doVoidExcess = nbt.getBoolean("doVoidExcess"); - mfh = mfh.loadNBTData(nbt); + mfh = MultiFluidHandler.loadNBTData(nbt); for (GTMTE_TFFTMultiHatch mh : sMultiHatches) { mh.setMultiFluidHandler(mfh); } |