aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index 893183b785..5fb54db129 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
+import net.minecraftforge.common.util.Constants.NBT;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -331,7 +332,8 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
public NBTBase saveDataToNBT() {
NBTTagCompound tNBT = new NBTTagCompound();
tNBT.setInteger("mFilterMode", mFilterMode);
- tNBT.setString("mFluid", FluidRegistry.getFluid(mFluidID).getName());
+ if (mFluidID >= 0)
+ tNBT.setString("mFluid", FluidRegistry.getFluid(mFluidID).getName());
return tNBT;
}
@@ -345,7 +347,10 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
if (aNBT instanceof NBTTagCompound) {
NBTTagCompound tNBT = (NBTTagCompound) aNBT;
mFilterMode = tNBT.getByte("mFilterMod");
- mFluidID = FluidRegistry.getFluidID(tNBT.getString("mFluid"));
+ if (tNBT.hasKey("mFluid", NBT.TAG_STRING))
+ mFluidID = FluidRegistry.getFluidID(tNBT.getString("mFluid"));
+ else
+ mFluidID = -1;
}
}