worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bukkit child permission handling to not include permissions with no children & cleanup permission registration

Browse Source
This commit is contained in:
Luck 2017-02-18 21:01:09 +00:00
parent abddb265be
commit 89ff3b169b
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java
View File

@ -24,8 +24,6 @@ package me.lucko.luckperms.bukkit;
import lombok.Getter; import lombok.Getter;
import com.google.common.collect.ImmutableMap;
import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Logger; import me.lucko.luckperms.api.Logger;
import me.lucko.luckperms.api.LuckPermsApi; import me.lucko.luckperms.api.LuckPermsApi;
@ -153,7 +151,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
defaultsProvider = new DefaultsProvider(); defaultsProvider = new DefaultsProvider();
childPermissionProvider = new ChildPermissionProvider(); childPermissionProvider = new ChildPermissionProvider();
// give all plugins a chance to load their defaults, then refresh. // give all plugins a chance to load their permissions, then refresh.
scheduler.doSyncLater(() -> { scheduler.doSyncLater(() -> {
defaultsProvider.refresh(); defaultsProvider.refresh();
childPermissionProvider.setup(); childPermissionProvider.setup();
@ -164,21 +162,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
perms.addAll(p.getChildren().keySet()); perms.addAll(p.getChildren().keySet());
}); });
getServer().getScheduler().runTaskAsynchronously(this, () -> {
defaultsProvider.getOpDefaults().entrySet().stream().map(Map.Entry::getKey).forEach(e -> permissionVault.offer(e));
defaultsProvider.getNonOpDefaults().entrySet().stream().map(Map.Entry::getKey).forEach(e -> permissionVault.offer(e));
perms.forEach(p -> permissionVault.offer(p)); perms.forEach(p -> permissionVault.offer(p));
ImmutableMap<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = childPermissionProvider.getPermissions();
for (Map.Entry<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> e : permissions.entrySet()) {
permissionVault.offer(e.getKey().getKey());
for (Map.Entry<String, Boolean> e1 : e.getValue().entrySet()) {
permissionVault.offer(e1.getKey());
}
}
});
}, 1L); }, 1L);
// register events // register events

10
bukkit/src/main/java/me/lucko/luckperms/bukkit/model/ChildPermissionProvider.java
View File

@ -40,21 +40,27 @@ public class ChildPermissionProvider {
private ImmutableMap<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = ImmutableMap.of(); private ImmutableMap<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = ImmutableMap.of();
public void setup() { public void setup() {
Map<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = new HashMap<>(); ImmutableMap.Builder<Map.Entry<String, Boolean>, ImmutableMap<String, Boolean>> permissions = ImmutableMap.builder();
for (Permission permission : Bukkit.getServer().getPluginManager().getPermissions()) { for (Permission permission : Bukkit.getServer().getPluginManager().getPermissions()) {
// handle true // handle true
Map<String, Boolean> trueChildren = new HashMap<>(); Map<String, Boolean> trueChildren = new HashMap<>();
resolveChildren(trueChildren, Collections.singletonMap(permission.getName(), true), false); resolveChildren(trueChildren, Collections.singletonMap(permission.getName(), true), false);
trueChildren.remove(permission.getName(), true);
if (!trueChildren.isEmpty()) {
permissions.put(Maps.immutableEntry(permission.getName().toLowerCase(), true), ImmutableMap.copyOf(trueChildren)); permissions.put(Maps.immutableEntry(permission.getName().toLowerCase(), true), ImmutableMap.copyOf(trueChildren));
}
// handle false // handle false
Map<String, Boolean> falseChildren = new HashMap<>(); Map<String, Boolean> falseChildren = new HashMap<>();
resolveChildren(falseChildren, Collections.singletonMap(permission.getName(), false), false); resolveChildren(falseChildren, Collections.singletonMap(permission.getName(), false), false);
falseChildren.remove(permission.getName(), false);
if (!falseChildren.isEmpty()) {
permissions.put(Maps.immutableEntry(permission.getName().toLowerCase(), false), ImmutableMap.copyOf(falseChildren)); permissions.put(Maps.immutableEntry(permission.getName().toLowerCase(), false), ImmutableMap.copyOf(falseChildren));
} }
}
this.permissions = ImmutableMap.copyOf(permissions); this.permissions = permissions.build();
} }
private static void resolveChildren(Map<String, Boolean> accumulator, Map<String, Boolean> children, boolean invert) { private static void resolveChildren(Map<String, Boolean> accumulator, Map<String, Boolean> children, boolean invert) {