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
@@ -72,7 +72,14 @@ public class BukkitUser extends User {
        }

        // Calculate the permissions that should be applied. This is done async, who cares about how long it takes or how often it's done.
-        Map<String, Boolean> toApply = getLocalPermissions(getPlugin().getConfiguration().getServer(), plugin.getUserManager().getWorldCache().get(getUuid()), null);
+        Map<String, Boolean> toApply = exportNodes(
+                getPlugin().getConfiguration().getServer(),
+                plugin.getUserManager().getWorldCache().get(getUuid()),
+                null,
+                plugin.getConfiguration().getIncludeGlobalPerms(),
+                true,
+                plugin.getPossiblePermissions()
+        );

        try {
            // The map in the LP PermissionAttachment is a ConcurrentHashMap. We can modify it's contents async.