summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2011-09-21 16:23:47 +0100
committerElgarL <ElgarL@palmergames.com>2011-09-21 16:23:47 +0100
commited67d67db0d072fff7470ff89a9efde6dbeff96e (patch)
treeb0a49059818f9582e4e954c975d7a761b04bf903
parenta04e5b4a47104dcea42f5856635772dbbb9dbeb1 (diff)
downloadEssentials-ed67d67db0d072fff7470ff89a9efde6dbeff96e.tar
Essentials-ed67d67db0d072fff7470ff89a9efde6dbeff96e.tar.gz
Essentials-ed67d67db0d072fff7470ff89a9efde6dbeff96e.tar.lz
Essentials-ed67d67db0d072fff7470ff89a9efde6dbeff96e.tar.xz
Essentials-ed67d67db0d072fff7470ff89a9efde6dbeff96e.zip
- Update to handle 'getDescription().getPermissions(') returning a
list (CB 1172).
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index f4ba657e7..6015b470e 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -12,4 +12,5 @@ v 1.1:
- Fixed BukkitPerms population. Wasn't correctly setting superperms.
- Push updates to superperms for all valid GM commands.
- All GroupManager commands issued by players are now echoed in the console.
- - Reverted WorldHolder static change to maintain backward plugin compatability. \ No newline at end of file
+ - Reverted WorldHolder static change to maintain backward plugin compatibility.
+ - Update to handle 'getDescription().getPermissions(') returning a list (CB 1172). \ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 97695ffdb..ec6fcebca 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -96,7 +96,8 @@ public class BukkitPermissions {
private void collectPermissions() {
registeredPermissions.clear();
for (Plugin bukkitPlugin : Bukkit.getServer().getPluginManager().getPlugins()) {
- registeredPermissions.addAll(bukkitPlugin.getDescription().getPermissions());
+ for(Permission permission : bukkitPlugin.getDescription().getPermissions())
+ registeredPermissions.add(permission);
}
}