diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-08-31 22:28:21 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-08-31 22:28:21 +0100 |
| commit | b1cfc8a8eda83530d1ae4d8ad78d198e1f524fee (patch) | |
| tree | c2e8df92a83ff4a46fd2dc9854783dba795f8d1a /EssentialsGroupManager/src | |
| parent | 6b9b6ba4201aeeaf399a10f377720fb9e0191c6f (diff) | |
| parent | 79c70b1f657f5de77119e494a632a9335a5154bb (diff) | |
| download | Essentials-b1cfc8a8eda83530d1ae4d8ad78d198e1f524fee.tar Essentials-b1cfc8a8eda83530d1ae4d8ad78d198e1f524fee.tar.gz Essentials-b1cfc8a8eda83530d1ae4d8ad78d198e1f524fee.tar.lz Essentials-b1cfc8a8eda83530d1ae4d8ad78d198e1f524fee.tar.xz Essentials-b1cfc8a8eda83530d1ae4d8ad78d198e1f524fee.zip | |
Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9
Diffstat (limited to 'EssentialsGroupManager/src')
3 files changed, 15 insertions, 7 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 2f535277b..5b409d773 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -194,4 +194,6 @@ 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.
+ - Include the GM version when logging errors.
\ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 61bb41dd1..46ec861a3 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -246,7 +246,7 @@ public class GroupManager extends JavaPlugin { lastError = ex.getMessage(); GroupManager.logger.severe("==================================================="); - GroupManager.logger.severe("= ERROR REPORT START ="); + GroupManager.logger.severe("= ERROR REPORT START - " + this.getDescription().getVersion() + " ="); GroupManager.logger.severe("==================================================="); GroupManager.logger.severe("=== PLEASE COPY AND PASTE THE ERROR.LOG FROM THE =="); GroupManager.logger.severe("= GROUPMANAGER FOLDER TO AN ESSENTIALS DEVELOPER ="); @@ -258,7 +258,9 @@ public class GroupManager extends JavaPlugin { // Append this error to the error log. try { - String error = "=============================== GM ERROR LOG ===============================\n\n"; + String error = "=============================== GM ERROR LOG ===============================\n"; + error += "= ERROR REPORT START - " + this.getDescription().getVersion() + " =\n\n"; + error += Tasks.getStackTraceAsString(ex); error += "\n============================================================================\n"; 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) { |