diff options
| author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-03-24 04:56:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-23 21:56:05 +0100 |
| commit | e44ae107a7337eeaefe156e857fdb6665b75ecac (patch) | |
| tree | b1c9f8119f77ae1dede18830ee4e49f3519e7b04 /src/main/java/gtPlusPlus/xmod/gregtech/common | |
| parent | f3b7ff0b7a8b71eebfa35d56109b0be04d298f3e (diff) | |
| download | GT5-Unofficial-e44ae107a7337eeaefe156e857fdb6665b75ecac.tar.gz GT5-Unofficial-e44ae107a7337eeaefe156e857fdb6665b75ecac.tar.bz2 GT5-Unofficial-e44ae107a7337eeaefe156e857fdb6665b75ecac.zip | |
Fix isamill NPE & chemplant structure check (#857)
fix
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java index 7b4c4f348e..b3de3a2426 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java @@ -431,7 +431,10 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< public ArrayList<ItemStack> getStoredInputs() { ArrayList<ItemStack> tItems = super.getStoredInputs(); for (GT_MetaTileEntity_Hatch_MillingBalls tHatch : filterValidMTEs(mMillingBallBuses)) { - tItems.addAll(tHatch.getContentUsageSlots()); + AutoMap<ItemStack> aHatchContent = tHatch.getContentUsageSlots(); + if (!aHatchContent.isEmpty()) { + tItems.addAll(aHatchContent); + } } return tItems; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index c92cb6a44b..9df9c0086f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -339,6 +339,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt mMachineCasingTier = 0; mPipeCasingTier = 0; mCoilTier = 0; + maxTierOfHatch = 0; mCatalystBuses.clear(); setCoilMeta(HeatingCoilLevel.None); if (checkPiece(mName, 3, 6, 0) && mCasing >= 70) { |