From ce8f05cd940ee00c80f9e328f2785484172a1300 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Wed, 21 Sep 2011 16:23:47 +0100 Subject: - Update to handle 'getDescription().getPermissions(') returning a list (CB 1172). --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../permissions/BukkitPermissions.java | 3 ++- lib/bukkit-0.0.1-SNAPSHOT.jar | Bin 3546558 -> 3553275 bytes lib/craftbukkit-0.0.1-SNAPSHOT.jar | Bin 8735124 -> 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 Binary files a/lib/bukkit-0.0.1-SNAPSHOT.jar and b/lib/bukkit-0.0.1-SNAPSHOT.jar differ diff --git a/lib/craftbukkit-0.0.1-SNAPSHOT.jar b/lib/craftbukkit-0.0.1-SNAPSHOT.jar index ff71362dc..ae30f0557 100644 Binary files a/lib/craftbukkit-0.0.1-SNAPSHOT.jar and b/lib/craftbukkit-0.0.1-SNAPSHOT.jar differ -- cgit v1.2.3