Fix NPE, and properly send possible permissions in BukkitUser

2016-08-30 13:06:36 +01:00
parent c15727377b
commit ab00c41452
2 changed files with 10 additions and 3 deletions
@@ -228,8 +228,8 @@ public abstract class PermissionHolder {
        Map<String, Boolean> perms = new HashMap<>();

        for (Node node : getAllNodesFiltered(server, world, extraContext, includeGlobal, applyGroups)) {
-            if (plugin.getConfiguration().getApplyWildcards()) {
-                if (node.getPermission().equals("*") || node.getPermission().equals("'*'")) {
+            if (node.getPermission().equals("*") || node.getPermission().equals("'*'")) {
+                if (possibleNodes != null && plugin.getConfiguration().getApplyWildcards()) {
                    possibleNodes.forEach(n -> perms.put(n, true));
                    continue;
                }