diff options
| author | snowleo <schneeleo@gmail.com> | 2011-12-08 04:14:27 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-12-08 04:14:27 +0100 |
| commit | a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7 (patch) | |
| tree | a4a59d2c1b6a8679338d825fc3038f40fef4a18d /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | |
| parent | 7e29f6521307daa2fb56543f3a04062e67383e94 (diff) | |
| parent | 697f3dbdb42bed6f1085249bbc7c87665ea646d9 (diff) | |
| download | Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.tar Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.tar.gz Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.tar.lz Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.tar.xz Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.zip | |
Merge branch 'refs/heads/groupmanager'
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java index 2b6a80da6..4ef77687a 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java @@ -631,7 +631,6 @@ public class WorldDataHolder { } else throw new IllegalArgumentException("Unknown entry found in Info section for group: " + thisGrp.getName() + " in file: " + groupsFile.getPath()); - //END INFO NODE if (thisGroupNode.get("inheritance") == null || thisGroupNode.get("inheritance") instanceof List) { @@ -753,14 +752,19 @@ public class WorldDataHolder { } - //USER INFO NODE - BETA - + //USER INFO NODE + //INFO NODE - Map<String, Object> infoNode = (Map<String, Object>) thisUserNode.get("info"); - if (infoNode != null) { - thisUser.setVariables(infoNode); - } - //END INFO NODE - BETA + if (thisUserNode.get("info") instanceof Map) { + Map<String, Object> infoNode = (Map<String, Object>) thisUserNode.get("info"); + if (infoNode != null) { + thisUser.setVariables(infoNode); + } + } else if (thisUserNode.get("info") != null) + throw new IllegalArgumentException("Unknown entry found in Info section for user: " + thisUser.getName() + " in file: " + usersFile.getPath()); + + //END INFO NODE + if (thisUserNode.get("group") != null) { Group hisGroup = ph.getGroup(thisUserNode.get("group").toString()); |