summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-07-23 22:34:43 +0200
committersnowleo <schneeleo@gmail.com>2011-07-23 22:34:43 +0200
commit832910d480bf2a209df49607c643b930e81b11f8 (patch)
tree8a9e583ae2267b059b343e9867b2e9a9e63bc45d
parent13da2b29248be399ab4dcff29853c54a093aeeed (diff)
parent164541794e194f93f4ff53a14f42a0dbd1a70760 (diff)
downloadEssentials-832910d480bf2a209df49607c643b930e81b11f8.tar
Essentials-832910d480bf2a209df49607c643b930e81b11f8.tar.gz
Essentials-832910d480bf2a209df49607c643b930e81b11f8.tar.lz
Essentials-832910d480bf2a209df49607c643b930e81b11f8.tar.xz
Essentials-832910d480bf2a209df49607c643b930e81b11f8.zip
Merge branch 'master' into releasestable-2.5.5
-rw-r--r--Essentials/src/com/earth2me/essentials/Permissions2Handler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Permissions2Handler.java b/Essentials/src/com/earth2me/essentials/Permissions2Handler.java
index 23353c643..71d7da58b 100644
--- a/Essentials/src/com/earth2me/essentials/Permissions2Handler.java
+++ b/Essentials/src/com/earth2me/essentials/Permissions2Handler.java
@@ -17,7 +17,8 @@ public class Permissions2Handler implements IPermissionsHandler
public String getGroup(final Player base)
{
- return permissionHandler.getGroup(base.getWorld().getName(), base.getName());
+ final String group = permissionHandler.getGroup(base.getWorld().getName(), base.getName());
+ return group == null ? "default" : group;
}
public boolean canBuild(final Player base, final String group)