From fd0134227cbe7d065bb941cd6129f46cf95c3d6d Mon Sep 17 00:00:00 2001 From: GunfighterJ Date: Fri, 19 Apr 2013 10:06:43 -0500 Subject: [PATCH] Fix NPE on invalid enchant --- Essentials/src/com/earth2me/essentials/MetaItemStack.java | 4 ++++ 1 file changed, 4 insertions(+) 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))