diff --git a/pom.xml b/pom.xml index fd3c46960..0701375e0 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ com.sk89q dummypermscompat - 1.2 + 1.3 diff --git a/src/main/java/com/sk89q/bukkit/migration/NijiPermissionsResolver.java b/src/main/java/com/sk89q/bukkit/migration/NijiPermissionsResolver.java index 84f32e674..df87acd18 100644 --- a/src/main/java/com/sk89q/bukkit/migration/NijiPermissionsResolver.java +++ b/src/main/java/com/sk89q/bukkit/migration/NijiPermissionsResolver.java @@ -101,16 +101,18 @@ public class NijiPermissionsResolver implements PermissionsResolver { try { Player player = server.getPlayer(name); if (player == null) return new String[0]; - String group; + String[] groups = null; try { - group = api.getHandler().getGroup(player.getWorld().getName(), player.getName()); + groups = api.getHandler().getGroups(player.getWorld().getName(), player.getName()); } catch (Throwable t) { - group = api.Security.getGroup(player.getName()); + String group = api.Security.getGroup(player.getWorld().getName(), player.getName()); + if (group != null) + groups = new String[] {group}; } - if (group == null) { + if (groups == null) { return new String[0]; } else { - return new String[]{ group }; + return groups; } } catch (Throwable t) { t.printStackTrace();