Merge branch 'refs/heads/groupmanager' into 2.9

This commit is contained in:
snowleo 2012-08-06 18:25:55 +02:00
commit 92267fa7f8
2 changed files with 4 additions and 3 deletions

View File

@ -192,3 +192,4 @@ v 2.0:
- Change to our own Yaml parsing for globalgroups instead of using the YAMLConfiguration class in bukkit. - Change to our own Yaml parsing for globalgroups instead of using the YAMLConfiguration class in bukkit.
- Fix a cases sensitivity bug in world loading. - 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. - Stop using the YamlConfiguration in bukkit for our config handling. We can now support periods in world names.
- Fix GlobalGroups not loading permission nodes.

View File

@ -161,7 +161,7 @@ public class GlobalGroups {
Object element; Object element;
// Permission nodes // Permission nodes
element = GGroups.get("groups." + groupName + ".permissions"); element = ((Map<String, Object>)allGroups.get(groupName)).get("permissions");
if (element != null) if (element != null)
if (element instanceof List) { if (element instanceof List) {
@ -180,7 +180,7 @@ public class GlobalGroups {
throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName); throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName);
// Info nodes // Info nodes
element = GGroups.get("groups." + groupName + ".info"); element = ((Map<String, Object>)allGroups.get(groupName)).get("info");
if (element != null) if (element != null)
if (element instanceof MemorySection) { if (element instanceof MemorySection) {