From e86949a1ad3269ec66c9de65e2c92f5e66251411 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Mon, 23 Mar 2015 14:25:27 +0000 Subject: More stuff. I don't even know by this point.... --- java/darkknight/jewelrycraft/util/JewelrycraftUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'java/darkknight/jewelrycraft/util/JewelrycraftUtil.java') diff --git a/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java index 70129f0..cd2328c 100644 --- a/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java +++ b/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java @@ -51,16 +51,16 @@ public class JewelrycraftUtil jewelry.add(new ItemStack(ItemList.earrings)); for(Object item: GameData.getItemRegistry()){ ArrayList items = new ArrayList(); - if (((Item)item).getHasSubtypes()){ - for(int i = 0; i < ((Item)item).getMaxDamage(); i++) - items.add(new ItemStack((Item)item, 1, i)); - }else objects.add(new ItemStack((Item)item)); + if (item != null && ((Item)item).getHasSubtypes()) ((Item)item).getSubItems((Item)item, null, items); + else objects.add(new ItemStack((Item)item)); + if (!items.isEmpty()) objects.addAll(items); } } /** - * Adds curse points to a player + * Adds curse points to a player + * * @param player the player to add the points to * @param points amount of curse points */ -- cgit v1.2.3