diff options
| author | EvilSeph <evilseph@gmail.com> | 2012-01-07 19:58:26 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-01-07 19:58:26 -0500 |
| commit | 30bb875342cc6ac86b2696a40fd86cf0ba9bb7b9 (patch) | |
| tree | 57c0be951257ac2c57935df1d4d13c1c5410d785 /src | |
| parent | b1815cc6c64b07a67a9749c1c461119ee873d4e0 (diff) | |
| download | bukkit-30bb875342cc6ac86b2696a40fd86cf0ba9bb7b9.tar bukkit-30bb875342cc6ac86b2696a40fd86cf0ba9bb7b9.tar.gz bukkit-30bb875342cc6ac86b2696a40fd86cf0ba9bb7b9.tar.lz bukkit-30bb875342cc6ac86b2696a40fd86cf0ba9bb7b9.tar.xz bukkit-30bb875342cc6ac86b2696a40fd86cf0ba9bb7b9.zip | |
Fixed NPE in ItemStack. Thanks jascotty2!
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/inventory/ItemStack.java | 5 |
1 files changed, 3 insertions, 2 deletions
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; |