summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java3
-rw-r--r--lib/bukkit-0.0.1-SNAPSHOT.jarbin3546558 -> 3553275 bytes
-rw-r--r--lib/craftbukkit-0.0.1-SNAPSHOT.jarbin8735124 -> 8743910 bytes
4 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);
}
}
diff --git a/lib/bukkit-0.0.1-SNAPSHOT.jar b/lib/bukkit-0.0.1-SNAPSHOT.jar
index 02cf2905d..b1236475d 100644
--- a/lib/bukkit-0.0.1-SNAPSHOT.jar
+++ b/lib/bukkit-0.0.1-SNAPSHOT.jar
Binary files differ
diff --git a/lib/craftbukkit-0.0.1-SNAPSHOT.jar b/lib/craftbukkit-0.0.1-SNAPSHOT.jar
index ff71362dc..ae30f0557 100644
--- a/lib/craftbukkit-0.0.1-SNAPSHOT.jar
+++ b/lib/craftbukkit-0.0.1-SNAPSHOT.jar
Binary files differ