summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-03-10 02:01:59 +0000
committerKHobbits <rob@khobbits.co.uk>2013-03-10 02:01:59 +0000
commit3399dd5c84a10ea41b8176612dd84da7b4e487f0 (patch)
tree514d6e9c6e56f0d929a7102849018a504be13d3b
parentdc3a9fa5fb58dc952a138e5d586f9f6fbb9910a0 (diff)
downloadEssentials-3399dd5c84a10ea41b8176612dd84da7b4e487f0.tar
Essentials-3399dd5c84a10ea41b8176612dd84da7b4e487f0.tar.gz
Essentials-3399dd5c84a10ea41b8176612dd84da7b4e487f0.tar.lz
Essentials-3399dd5c84a10ea41b8176612dd84da7b4e487f0.tar.xz
Essentials-3399dd5c84a10ea41b8176612dd84da7b4e487f0.zip
Protect us from npe.
-rw-r--r--Essentials/src/com/earth2me/essentials/MetaItemStack.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/MetaItemStack.java b/Essentials/src/com/earth2me/essentials/MetaItemStack.java
index 9f413f8c7..ce6fda454 100644
--- a/Essentials/src/com/earth2me/essentials/MetaItemStack.java
+++ b/Essentials/src/com/earth2me/essentials/MetaItemStack.java
@@ -347,7 +347,7 @@ public class MetaItemStack
if (split[0].equalsIgnoreCase("effect") || (allowShortName && split[0].equalsIgnoreCase("e")))
{
pEffectType = Potions.getByName(split[1]);
- if (pEffectType != null)
+ if (pEffectType != null && pEffectType.getName() != null)
{
if (hasMetaPermission(sender, "potions." + pEffectType.getName().toLowerCase(), false, false, ess))
{