summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunfighterJ <joseph.jenniges@gmail.com>2013-04-19 10:06:43 -0500
committerGunfighterJ <joseph.jenniges@gmail.com>2013-04-19 10:06:43 -0500
commit52a92fc97c28bd9957f3bd20d2979231cd8e77ee (patch)
tree6c5fcf7e66782392e3c0e59c0394a531f2dde190
parent2ab5676e27ae63138c79f90ed7eab6c01f0746df (diff)
downloadEssentials-52a92fc97c28bd9957f3bd20d2979231cd8e77ee.tar
Essentials-52a92fc97c28bd9957f3bd20d2979231cd8e77ee.tar.gz
Essentials-52a92fc97c28bd9957f3bd20d2979231cd8e77ee.tar.lz
Essentials-52a92fc97c28bd9957f3bd20d2979231cd8e77ee.tar.xz
Essentials-52a92fc97c28bd9957f3bd20d2979231cd8e77ee.zip
Fix NPE on invalid enchant
-rw-r--r--Essentials/src/com/earth2me/essentials/MetaItemStack.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/MetaItemStack.java b/Essentials/src/com/earth2me/essentials/MetaItemStack.java
index 665302dfb..f7ea6dbcc 100644
--- a/Essentials/src/com/earth2me/essentials/MetaItemStack.java
+++ b/Essentials/src/com/earth2me/essentials/MetaItemStack.java
@@ -432,6 +432,10 @@ public class MetaItemStack
public void addEnchantment(final CommandSender sender, final boolean allowUnsafe, final Enchantment enchantment, final int level) throws Exception
{
+ if (enchantment == null)
+ {
+ throw new Exception(_("enchantmentNotFound"));
+ }
try
{
if (stack.getType().equals(Material.ENCHANTED_BOOK))