diff options
author | ElgarL <ElgarL@palmergames.com> | 2012-01-17 18:03:16 +0000 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2012-01-17 18:03:16 +0000 |
commit | 89c41b0508edd847316a293926fb56a7b249e6ba (patch) | |
tree | 356b085b0c81ca7ace8be88bbe858bb9cdbe414f /EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java | |
parent | 1a0b03db4dfb814258b3ce4b45c52e8c090773c7 (diff) | |
download | Essentials-89c41b0508edd847316a293926fb56a7b249e6ba.tar Essentials-89c41b0508edd847316a293926fb56a7b249e6ba.tar.gz Essentials-89c41b0508edd847316a293926fb56a7b249e6ba.tar.lz Essentials-89c41b0508edd847316a293926fb56a7b249e6ba.tar.xz Essentials-89c41b0508edd847316a293926fb56a7b249e6ba.zip |
v 1.9:
Optimize populating Bukkit perms so we no longer calculate the
child
nodes (Bukkit already does this).
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java index ebaadf8bd..91f9a9bd6 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -79,7 +79,7 @@ public class BukkitPermissions { public BukkitPermissions(GroupManager plugin) {
this.plugin = plugin;
- //this.collectPermissions();
+ this.collectPermissions();
this.registerEvents();
this.updateAllPlayers();
@@ -105,15 +105,20 @@ public class BukkitPermissions { manager.registerEvent(Event.Type.PLUGIN_DISABLE, serverListener, Event.Priority.Normal, plugin);
}
- /*
+
public void collectPermissions() {
registeredPermissions.clear();
+ /*
for (Plugin bukkitPlugin : Bukkit.getServer().getPluginManager().getPlugins()) {
for (Permission permission : bukkitPlugin.getDescription().getPermissions())
registeredPermissions.push(permission);
}
+ */
+
+ registeredPermissions = new LinkedList<Permission>(Bukkit.getPluginManager().getPermissions());
+
}
- */
+
public void updatePermissions(Player player) {
this.updatePermissions(player, null);
@@ -194,7 +199,7 @@ public class BukkitPermissions { // Add all permissions for this player (GM only)
// child nodes will be calculated by Bukkit.
- List<String> playerPermArray = worldData.getPermissionsHandler().getAllPlayersPermissions(player.getName());
+ List<String> playerPermArray = worldData.getPermissionsHandler().getAllPlayersPermissions(player.getName(), false);
Map<String, Boolean> newPerms = new HashMap<String, Boolean>();
for (String permission : playerPermArray) {
@@ -210,6 +215,7 @@ public class BukkitPermissions { */
newPerms.put(permission, value);
}
+
//player.recalculatePermissions();
/**
@@ -373,13 +379,13 @@ public class BukkitPermissions { if (!GroupManager.isLoaded())
return;
- //collectPermissions();
+ collectPermissions();
updateAllPlayers();
}
@Override
public void onPluginDisable(PluginDisableEvent event) {
- // collectPermissions();
+ collectPermissions();
// updateAllPlayers();
}
}
|