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/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | |
| 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/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 12 |
1 files changed, 8 insertions, 4 deletions
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) { |