Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 01:27:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'refs/heads/groupmanager' into 2.9

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EssentialsGroupManager/src/Changelog.txt
View File

@ -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.
- Stop using the YamlConfiguration in bukkit for our config handling. We can now support periods in world names.
- Fix GlobalGroups not loading permission nodes.

4
EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java
View File

@ -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) {