summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2012-08-06 17:15:56 +0100
committerElgarL <ElgarL@palmergames.com>2012-08-06 17:15:56 +0100
commit3c5f9e16162aa66874911d052bdbe710ae1b1b8f (patch)
tree1a03ee66b4f777357b996dd2d177aee33e587d64 /EssentialsGroupManager/src
parenta7a06963ac34807ab9a6149a22a6f7ea717b54a2 (diff)
downloadEssentials-3c5f9e16162aa66874911d052bdbe710ae1b1b8f.tar
Essentials-3c5f9e16162aa66874911d052bdbe710ae1b1b8f.tar.gz
Essentials-3c5f9e16162aa66874911d052bdbe710ae1b1b8f.tar.lz
Essentials-3c5f9e16162aa66874911d052bdbe710ae1b1b8f.tar.xz
Essentials-3c5f9e16162aa66874911d052bdbe710ae1b1b8f.zip
Fix GlobalGroups not loading permission nodes.
Diffstat (limited to 'EssentialsGroupManager/src')
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java4
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) {