Merge branch 'master' into release

This commit is contained in:
snowleo 2011-07-23 22:34:43 +02:00
commit 832910d480

View File

@ -17,7 +17,8 @@ public class Permissions2Handler implements IPermissionsHandler
public String getGroup(final Player base) 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) public boolean canBuild(final Player base, final String group)