diff options
| author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2024-03-23 23:39:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-23 23:39:07 +0100 |
| commit | 7a0d0542bfab40061f4f8d37866048657b8415cc (patch) | |
| tree | bec3f415e7d39730bc4ee79f24318f0d3c1db3d5 /src/main | |
| parent | b2a84aea7d278639203450610bce007b92973357 (diff) | |
| download | GT5-Unofficial-7a0d0542bfab40061f4f8d37866048657b8415cc.tar.gz GT5-Unofficial-7a0d0542bfab40061f4f8d37866048657b8415cc.tar.bz2 GT5-Unofficial-7a0d0542bfab40061f4f8d37866048657b8415cc.zip | |
Fix EoH NPE (#277)
* fix scanner info NPE
* fluidstack can't be null either
* another fluidstack check
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index d52d7855a0..f68b630ce7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -1560,7 +1560,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl str.add("EU Output: " + RED + toStandardForm(outputEU_BigInt) + RESET + " EU"); str.add("EU Input: " + RED + toStandardForm(usedEU.abs()) + RESET + " EU"); int currentMaxProgresstime = Math.max(maxProgresstime(), 1); - if (outputFluids.size() > 0) { + if (starMatter != null && starMatter.fluidStack != null) { FluidStackLong starMatterOutput = new FluidStackLong( starMatter.fluidStack, (long) (starMatter.amount * yield * successChance * parallelAmount)); @@ -1577,7 +1577,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl + " L/s"); FluidStackLong stellarPlasmaOutput = new FluidStackLong( - stellarPlasma.fluidStack, + MaterialsUEVplus.RawStarMatter.getFluid(0), (long) (stellarPlasma.amount * yield * successChance * parallelAmount)); str.add( "Average " + stellarPlasmaOutput.fluidStack.getLocalizedName() @@ -1683,15 +1683,18 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl aNBT.setTag(FLUID_OUTPUT_NBT_TAG, fluidStackListNBTTag); - NBTTagCompound fixedRecipeOutputs = new NBTTagCompound(); + if (starMatter != null && starMatter.fluidStack != null) { - fixedRecipeOutputs.setLong(0 + FLUID_AMOUNT, starMatter.amount); - aNBT.setTag(CURRENT_RECIPE_STAR_MATTER_TAG, starMatter.fluidStack.writeToNBT(new NBTTagCompound())); + NBTTagCompound fixedRecipeOutputs = new NBTTagCompound(); - fixedRecipeOutputs.setLong(1 + FLUID_AMOUNT, stellarPlasma.amount); - aNBT.setTag(CURRENT_RECIPE_STELLAR_PLASMA_TAG, stellarPlasma.fluidStack.writeToNBT(new NBTTagCompound())); + fixedRecipeOutputs.setLong(0 + FLUID_AMOUNT, starMatter.amount); + aNBT.setTag(CURRENT_RECIPE_STAR_MATTER_TAG, starMatter.fluidStack.writeToNBT(new NBTTagCompound())); - aNBT.setTag(CURRENT_RECIPE_FIXED_OUTPUTS_TAG, fixedRecipeOutputs); + fixedRecipeOutputs.setLong(1 + FLUID_AMOUNT, stellarPlasma.amount); + aNBT.setTag(CURRENT_RECIPE_STELLAR_PLASMA_TAG, stellarPlasma.fluidStack.writeToNBT(new NBTTagCompound())); + + aNBT.setTag(CURRENT_RECIPE_FIXED_OUTPUTS_TAG, fixedRecipeOutputs); + } super.saveNBTData(aNBT); } |