TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-10-03 23:34:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9

Browse source
This commit is contained in:
KHobbits 2012-08-31 22:28:21 +01:00
parent 6b9b6ba420 79c70b1f65
commit b1cfc8a8ed
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
EssentialsGroupManager/src/Changelog.txt
View file

@ -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 more null errors from corrupt config.yml's.
- Give a better error when a subgroup is null.
- Include the GM version when logging errors.

6
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
View file

@ -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";

12
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
View file

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