keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #565 from CovertJaguar/patch-1 

Possible NPE if the liquid isn't in the LD
This commit is contained in:
LexManos 2013-05-13 21:09:00 -07:00
parent 55dac73d10 a88692a0f2
commit 348add87b3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/net/minecraftforge/liquids/LiquidStack.java
View File

@ -54,7 +54,11 @@ public class LiquidStack
nbt.setInteger("Amount", amount); nbt.setInteger("Amount", amount);
nbt.setShort("Id", (short)itemID); nbt.setShort("Id", (short)itemID);
nbt.setShort("Meta", (short)itemMeta); nbt.setShort("Meta", (short)itemMeta);
nbt.setString("LiquidName", LiquidDictionary.findLiquidName(this)); String name = LiquidDictionary.findLiquidName(this);
if(name != null)
{
nbt.setString("LiquidName", name);
}
if (extra != null) if (extra != null)
{ {
nbt.setTag("extra", extra); nbt.setTag("extra", extra);