From 61bf7cd2215e844aff5f18837499cf0d40bc2a41 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Tue, 23 Aug 2022 12:36:21 +0800 Subject: fix a bunch of structure code error (#294) --- .../base/GregtechMeta_MultiBlockBase.java | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index da38f14758..0e5027fc09 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -1622,7 +1622,28 @@ public abstract class GregtechMeta_MultiBlockBase aHatches, int aAmount) { + for (final GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : aHatches) { + if (isValidMetaTileEntity(tHatch)) { + FluidStack tLiquid = tHatch.getFluid(); + if (tLiquid == null || tLiquid.amount < aAmount) { + continue; + } + tLiquid = tHatch.drain(aAmount, false); + if (tLiquid != null && tLiquid.amount >= aAmount) { + tLiquid = tHatch.drain(aAmount, true); + return tLiquid != null && tLiquid.amount >= aAmount; + } + } + } + return false; + } + + @Override public void updateSlots() { for (final GT_MetaTileEntity_Hatch_InputBattery tHatch : this.mChargeHatches) { if (isValidMetaTileEntity(tHatch)) { -- cgit