fix NullPointerException #4

NyaaCat · Aug 17, 2016 · 16f9224 · 16f9224
1 parent 7ca98e5
commit 16f9224
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/cat/nyaa/nyaautils/CommandHandler.java b/src/main/java/cat/nyaa/nyaautils/CommandHandler.java
@@ -54,10 +54,9 @@ public void commandEnchant(CommandSender sender, Arguments args) {
                     msg.append(" " + I18n._("user.enchant.max_level", plugin.cfg.enchantMaxLevel.get(e)));
                     p.spigot().sendMessage(msg.inner);
                 } else {
-                    // FIXME
-                    // if (e.getName().equalsIgnoreCase("Custom Enchantment")) {
-                    //     continue;
-                    // }
+                    if (e == null || e.getName() == null || e.getName().equalsIgnoreCase("Custom Enchantment")) {
+                        continue;
+                    }
                     p.sendMessage(e.getName() + ": " + e.getName() + " " +
                             I18n._("user.enchant.max_level", plugin.cfg.enchantMaxLevel.get(e)));
                 }

diff --git a/src/main/java/cat/nyaa/nyaautils/Configuration.java b/src/main/java/cat/nyaa/nyaautils/Configuration.java
@@ -66,10 +66,9 @@ public void deserialize(ConfigurationSection config) {
         if (config.isConfigurationSection("enchant")) {
             ConfigurationSection list = config.getConfigurationSection("enchant");
             for (Enchantment e : Enchantment.values()) {
-                // FIXME
-                // if (e.getName().equalsIgnoreCase("Custom Enchantment")) {
-                //     continue;
-                // }
+                if (e == null || e.getName() == null || e.getName().equalsIgnoreCase("Custom Enchantment")) {
+                    continue;
+                }
                 enchantMaxLevel.put(e, list.getInt(e.getName() + ".MaxLevel", e.getMaxLevel()));
             }
         }