From 30bb875342cc6ac86b2696a40fd86cf0ba9bb7b9 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Sat, 7 Jan 2012 19:58:26 -0500 Subject: Fixed NPE in ItemStack. Thanks jascotty2! --- src/main/java/org/bukkit/inventory/ItemStack.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java index 87cd9ca6..d8256fca 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -122,8 +122,9 @@ public class ItemStack implements ConfigurationSerializable { * @return MaterialData for this item */ public MaterialData getData() { - if (Material.getMaterial(getTypeId()).getData() != null) { - data = Material.getMaterial(getTypeId()).getNewData((byte) this.durability); + Material mat = Material.getMaterial(getTypeId()); + if (mat != null && mat.getData() != null) { + data = mat.getNewData((byte) this.durability); } return data; -- cgit v1.2.3