Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed #328 - Bucket fluid name NPE

Browse source
This commit is contained in:
Calclavia 2014-02-28 08:23:30 +08:00
parent 900b244aa6
commit bebde23242
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/resonantinduction/core/resource/fluid/ItemOreResourceBucket.java
View file

@ -47,15 +47,18 @@ public class ItemOreResourceBucket extends Item
@Override @Override
public String getItemDisplayName(ItemStack is) 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(); String fluidName = FluidRegistry.getFluid(fluidID).getLocalizedName();
return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", fluidName).replace(" ", " "); return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", fluidName).replace(" ", " ");
} }
return material;
} }
return null; return null;