From 5ad133c664ff6e9f43fffd92112a666a794b155b Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 21:43:59 -0400 Subject: [PATCH] Sanity check the item ID for loaded liquid stacks better. --- common/net/minecraftforge/liquids/LiquidStack.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/net/minecraftforge/liquids/LiquidStack.java b/common/net/minecraftforge/liquids/LiquidStack.java index f9848eaf0..e13cc3597 100644 --- a/common/net/minecraftforge/liquids/LiquidStack.java +++ b/common/net/minecraftforge/liquids/LiquidStack.java @@ -132,6 +132,11 @@ public class LiquidStack itemID = liquid.itemID; itemMeta = liquid.itemMeta; } + // if the item is not existent, and no liquid dictionary is found, null returns + else if (Item.itemsList[itemID] == null) + { + return null; + } int amount = nbt.getInteger("Amount"); LiquidStack liquidstack = new LiquidStack(itemID, amount, itemMeta); return liquidstack.itemID == 0 ? null : liquidstack;