diff options
| author | ElgarL <ElgarL@palmergames.com> | 2012-08-31 21:47:35 +0100 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2012-08-31 21:47:35 +0100 |
| commit | cfe634e8f7ced43a70e549681abe7022683cbf59 (patch) | |
| tree | 13c9c84131469b37f94648ace95d18ba0d2457fd /EssentialsGroupManager | |
| parent | d588c3f271419bb6b423d68f95c12eb74c72dc49 (diff) | |
| download | Essentials-cfe634e8f7ced43a70e549681abe7022683cbf59.tar Essentials-cfe634e8f7ced43a70e549681abe7022683cbf59.tar.gz Essentials-cfe634e8f7ced43a70e549681abe7022683cbf59.tar.lz Essentials-cfe634e8f7ced43a70e549681abe7022683cbf59.tar.xz Essentials-cfe634e8f7ced43a70e549681abe7022683cbf59.zip | |
Give a better error when a subgroup is null.
Diffstat (limited to 'EssentialsGroupManager')
| -rw-r--r-- | EssentialsGroupManager/src/Changelog.txt | 3 | ||||
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 2f535277b..78204d9b7 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -194,4 +194,5 @@ v 2.0: - Stop using the YamlConfiguration in bukkit for our config handling. We can now support periods in world names.
- Fix GlobalGroups not loading permission nodes.
- Fix an error with Logging set to 'OFF' triggering a cast exception.
- - No more null errors from corrupt config.yml's.
\ No newline at end of file + - No more null errors from corrupt config.yml's.
+ - Give a better error when a subgroup is null.
\ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java index 3df3271a3..aad59e5aa 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java @@ -861,11 +861,15 @@ public class WorldDataHolder { */ } else if (nodeData instanceof List) { for (Object o : ((List) nodeData)) { - Group subGrp = ph.getGroup(o.toString()); - if (subGrp != null) { - thisUser.addSubGroup(subGrp); + if (o == null) { + GroupManager.logger.warning("Invalid Subgroup data for user: " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath()); } else { - GroupManager.logger.warning("Subgroup '" + o.toString() + "' not found for user: " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath()); + Group subGrp = ph.getGroup(o.toString()); + if (subGrp != null) { + thisUser.addSubGroup(subGrp); + } else { + GroupManager.logger.warning("Subgroup '" + o.toString() + "' not found for user: " + thisUser.getName() + ". Ignoring entry in file: " + usersFile.getPath()); + } } } } else if (nodeData instanceof String) { |