spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-08-20 05:14:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed NPE in ItemStack. Thanks jascotty2!

Browse source
This commit is contained in:
EvilSeph 2012-01-07 19:58:26 -05:00
parent b1815cc6c6
commit 30bb875342
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/bukkit/inventory/ItemStack.java
View file

@ -122,8 +122,9 @@ public class ItemStack implements ConfigurationSerializable {
* @return MaterialData for this item * @return MaterialData for this item
*/ */
public MaterialData getData() { public MaterialData getData() {
if (Material.getMaterial(getTypeId()).getData() != null) { Material mat = Material.getMaterial(getTypeId());
data = Material.getMaterial(getTypeId()).getNewData((byte) this.durability); if (mat != null && mat.getData() != null) {
data = mat.getNewData((byte) this.durability);
} }
return data; return data;