From 5ce5f507071ff505dbed388b0dfe6105f92bcfcc Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Tue, 24 Jan 2023 01:40:11 +0800
Subject: guard against null hotName (#129)

* guard against null hotName

* spotlessApply (#130)

Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java
index 75d131aff3..1cef7179dc 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java
@@ -37,6 +37,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
+import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -167,9 +168,12 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas
     @Override
     public void loadNBTData(NBTTagCompound aNBT) {
         transformed = aNBT.getBoolean("transformed");
-        hotName = aNBT.getString("hotName");
-        if (hotName != null) {
+        if (aNBT.hasKey("hotName", Constants.NBT.TAG_STRING)) {
+            hotName = aNBT.getString("hotName");
             tRunningRecipe = MyRecipeAdder.mXHeatExchangerFuelMap.get(new Fluid(hotName));
+        } else {
+            hotName = null;
+            tRunningRecipe = null;
         }
         super.loadNBTData(aNBT);
     }
@@ -177,7 +181,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         aNBT.setBoolean("transformed", transformed);
-        aNBT.setString("hotName", hotName);
+        if (hotName != null) aNBT.setString("hotName", hotName);
         super.saveNBTData(aNBT);
     }
 
-- 
cgit