summaryrefslogtreecommitdiffstats
path: root/Essentials/src/com/earth2me/essentials/EssentialsConf.java
diff options
context:
space:
mode:
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/EssentialsConf.java')
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsConf.java24
1 files changed, 14 insertions, 10 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
index b07c9710f..8b8b79279 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
@@ -232,21 +232,25 @@ public class EssentialsConf extends Configuration
Material.valueOf(getString(path + ".type", "AIR")),
getInt(path + ".amount", 1),
(short)getInt(path + ".damage", 0));
- List<String> enchants = getKeys(path + ".enchant");
- for (String enchant : enchants)
+ final List<String> enchants = getKeys(path + ".enchant");
+ if (enchants != null)
{
- Enchantment enchantment = Enchantment.getByName(enchant.toUpperCase(Locale.ENGLISH));
- if (enchantment == null) {
- continue;
+ for (String enchant : enchants)
+ {
+ final Enchantment enchantment = Enchantment.getByName(enchant.toUpperCase(Locale.ENGLISH));
+ if (enchantment == null)
+ {
+ continue;
+ }
+ final int level = getInt(path + ".enchant." + enchant, enchantment.getStartLevel());
+ stack.addUnsafeEnchantment(enchantment, level);
}
- int level = getInt(path+ ".enchant."+enchant, enchantment.getStartLevel());
- stack.addUnsafeEnchantment(enchantment, level);
}
return stack;
/*
- * ,
- * (byte)getInt(path + ".data", 0)
- */
+ * ,
+ * (byte)getInt(path + ".data", 0)
+ */
}
public void setProperty(final String path, final ItemStack stack)