diff options
| author | snowleo <schneeleo@gmail.com> | 2012-08-06 18:25:55 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-08-06 18:25:55 +0200 |
| commit | 92267fa7f8965a0edffd15bd8bd37a8d2f99b458 (patch) | |
| tree | ac11d2aa6efb094e9097ec050a1d7ba44f820996 | |
| parent | c2db96edc81568c7f5bfd1933662fbcb21ba6f6e (diff) | |
| parent | 3c5f9e16162aa66874911d052bdbe710ae1b1b8f (diff) | |
| download | Essentials-92267fa7f8965a0edffd15bd8bd37a8d2f99b458.tar Essentials-92267fa7f8965a0edffd15bd8bd37a8d2f99b458.tar.gz Essentials-92267fa7f8965a0edffd15bd8bd37a8d2f99b458.tar.lz Essentials-92267fa7f8965a0edffd15bd8bd37a8d2f99b458.tar.xz Essentials-92267fa7f8965a0edffd15bd8bd37a8d2f99b458.zip | |
Merge branch 'refs/heads/groupmanager' into 2.9
| -rw-r--r-- | EssentialsGroupManager/src/Changelog.txt | 3 | ||||
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 027df85f8..63fa8b9d7 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -191,4 +191,5 @@ v 2.0: - Stop force removing attachments and let Bukkit handle it's own mess.
- Change to our own Yaml parsing for globalgroups instead of using the YAMLConfiguration class in bukkit.
- Fix a cases sensitivity bug in world loading.
- - Stop using the YamlConfiguration in bukkit for our config handling. We can now support periods in world names.
\ No newline at end of file + - Stop using the YamlConfiguration in bukkit for our config handling. We can now support periods in world names.
+ - Fix GlobalGroups not loading permission nodes.
\ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java index a84666b8e..cc8181ddf 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java @@ -161,7 +161,7 @@ public class GlobalGroups { Object element;
// Permission nodes
- element = GGroups.get("groups." + groupName + ".permissions");
+ element = ((Map<String, Object>)allGroups.get(groupName)).get("permissions");
if (element != null)
if (element instanceof List) {
@@ -180,7 +180,7 @@ public class GlobalGroups { throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName);
// Info nodes
- element = GGroups.get("groups." + groupName + ".info");
+ element = ((Map<String, Object>)allGroups.get(groupName)).get("info");
if (element != null)
if (element instanceof MemorySection) {
|