From edf5e8eb324cbdaa19489ee7ebfe42bc18cf4582 Mon Sep 17 00:00:00 2001 From: psxlover Date: Thu, 12 Jul 2012 00:04:05 +0300 Subject: [PATCH] Null pointer exception when starting a server. --- .../net/minecraft/src/buildcraft/energy/EngineIron.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/net/minecraft/src/buildcraft/energy/EngineIron.java b/common/net/minecraft/src/buildcraft/energy/EngineIron.java index 0981b8d3..8f1cced0 100644 --- a/common/net/minecraft/src/buildcraft/energy/EngineIron.java +++ b/common/net/minecraft/src/buildcraft/energy/EngineIron.java @@ -18,6 +18,7 @@ import net.minecraft.src.buildcraft.api.IronEngineFuel; import net.minecraft.src.buildcraft.api.LiquidSlot; import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.liquids.LiquidManager; +import net.minecraft.src.buildcraft.api.liquids.LiquidStack; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.Utils; @@ -124,7 +125,12 @@ public class EngineIron extends Engine { super.update(); if (itemInInventory != null) { - int liquidId = LiquidManager.getLiquidForFilledItem(itemInInventory).itemID; + + LiquidStack liquidForFilledItem = LiquidManager.getLiquidForFilledItem(itemInInventory); + if (liquidForFilledItem == null) + return; + + int liquidId = liquidForFilledItem.itemID; if (liquidId != 0) { if (fill(Orientations.Unknown, BuildCraftAPI.BUCKET_VOLUME, liquidId, false) == BuildCraftAPI.BUCKET_VOLUME) {