summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ward <chris@chrisgward.com>2013-10-19 19:36:43 +1100
committerKHobbits <rob@khobbits.co.uk>2013-10-19 12:19:39 +0100
commit5eabb8ac26a90e0dd0970e6538302f4d675c713b (patch)
tree111109ea78f8d8ee37cf063cd5beb2743ab56811
parent0ba3afe881f53951c6f36ae46b2400aebdc9f5f4 (diff)
downloadEssentials-5eabb8ac26a90e0dd0970e6538302f4d675c713b.tar
Essentials-5eabb8ac26a90e0dd0970e6538302f4d675c713b.tar.gz
Essentials-5eabb8ac26a90e0dd0970e6538302f4d675c713b.tar.lz
Essentials-5eabb8ac26a90e0dd0970e6538302f4d675c713b.tar.xz
Essentials-5eabb8ac26a90e0dd0970e6538302f4d675c713b.zip
Fix null pointer exception on kits with meta
-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 820591f03..ead81a003 100644
--- a/Essentials/src/com/earth2me/essentials/MetaItemStack.java
+++ b/Essentials/src/com/earth2me/essentials/MetaItemStack.java
@@ -497,7 +497,7 @@ public class MetaItemStack
private boolean hasMetaPermission(final CommandSource sender, final String metaPerm, final boolean graceful, final boolean includeBase, final IEssentials ess) throws Exception
{
- final User user = sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null;
+ final User user = sender != null && sender.isPlayer() ? ess.getUser(sender.getPlayer()) : null;
return hasMetaPermission(user, metaPerm, graceful, includeBase);
}