From ec846a4e46719d11323314931845d878ca575f6b Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 19 Oct 2014 19:48:00 +0200 Subject: [PATCH] fix #2062 --- common/buildcraft/energy/TileEngineIron.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index c4df3edf..58e9f6f6 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -16,20 +16,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.BiomeGenBase; - import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; import buildcraft.api.core.StackKey; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.ICoolant; import buildcraft.api.fuels.IFuel; +import buildcraft.api.fuels.ISolidCoolant; import buildcraft.api.gates.ITrigger; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; @@ -199,7 +198,10 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan if (stack != null) { FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(stack); if (liquid == null && heat > MIN_HEAT * 2) { - liquid = BuildcraftFuelRegistry.coolant.getSolidCoolant(StackKey.stack(stack)).getFluidFromSolidCoolant(stack); + ISolidCoolant coolant = BuildcraftFuelRegistry.coolant.getSolidCoolant(StackKey.stack(stack)); + if (coolant != null) { + liquid = coolant.getFluidFromSolidCoolant(stack); + } } if (liquid != null) {