Add primary groups

This commit is contained in:
Luck
2016-06-24 18:38:05 +01:00
Unverified
parent 34ca3b3c25
commit 697b349167
12 changed files with 100 additions and 22 deletions
@@ -90,7 +90,10 @@ class VaultHook extends Permission {
@Override
public boolean playerInGroup(String world, String player, String group) {
final User user = plugin.getUserManager().getUser(player);
return user != null && user.getGroupNames().contains(group);
if (user == null) return false;
final Group group1 = plugin.getGroupManager().getGroup(group);
return group1 != null && user.isInGroup(group1);
}
@Override
@@ -126,14 +129,13 @@ class VaultHook extends Permission {
@Override
public String[] getPlayerGroups(String world, String player) {
final User user = plugin.getUserManager().getUser(player);
if (user == null) return new String[0];
return user.getGroupNames().toArray(new String[0]);
return (user == null) ? new String[0] : user.getGroupNames().toArray(new String[0]);
}
@Override
public String getPrimaryGroup(String world, String player) {
throw new UnsupportedOperationException();
final User user = plugin.getUserManager().getUser(player);
return (user == null) ? null : user.getPrimaryGroup();
}
@Override