From bebde23242e29fc5281f10a41f6e09fbc29f781a Mon Sep 17 00:00:00 2001 From: Calclavia Date: Fri, 28 Feb 2014 08:23:30 +0800 Subject: [PATCH] Fixed #328 - Bucket fluid name NPE --- .../core/resource/fluid/ItemOreResourceBucket.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java b/src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java index 5b0d824b..2cd90730 100644 --- a/src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java +++ b/src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java @@ -47,17 +47,20 @@ public class ItemOreResourceBucket extends Item @Override public String getItemDisplayName(ItemStack is) { - if (getMaterialFromStack(is) != null) + String material = getMaterialFromStack(is); + if (material != null) { - String fluidID = isMolten ? ResourceGenerator.materialNameToMolten(getMaterialFromStack(is)) : ResourceGenerator.materialNameToMixture(getMaterialFromStack(is)); + String fluidID = isMolten ? ResourceGenerator.materialNameToMolten(material) : ResourceGenerator.materialNameToMixture(material); - if (fluidID != null) + if (fluidID != null && FluidRegistry.getFluid(fluidID) != null) { String fluidName = FluidRegistry.getFluid(fluidID).getLocalizedName(); return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", fluidName).replace(" ", " "); } + + return material; } - + return null; }