summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2011-09-03 16:13:43 +0100
committerElgarL <ElgarL@palmergames.com>2011-09-03 16:13:43 +0100
commit88703a92c7b721903ebf6490c681c208d8ecef89 (patch)
tree688ecd7c0c968db4d68bae4e8824dcfe0e1ddd60 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
parentd8361bcb894acf13c36ee7b4374796a2e1c1a981 (diff)
downloadEssentials-88703a92c7b721903ebf6490c681c208d8ecef89.tar
Essentials-88703a92c7b721903ebf6490c681c208d8ecef89.tar.gz
Essentials-88703a92c7b721903ebf6490c681c208d8ecef89.tar.lz
Essentials-88703a92c7b721903ebf6490c681c208d8ecef89.tar.xz
Essentials-88703a92c7b721903ebf6490c681c208d8ecef89.zip
- Fix for Users.yml containing only 'users:' causing a crash.
- GroupManager will now generate a fresh Users and Groups yml if either file is empty.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index ae68e03cc..77d933fa0 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -578,6 +578,11 @@ public class WorldDataHolder {
// PROCESS USERS FILE
Map<String, Object> allUsersNode = (Map<String, Object>) usersRootDataNode.get("users");
+
+ // Stop loading if the file is empty
+ if (allUsersNode == null)
+ return ph;
+
for (String usersKey : allUsersNode.keySet()) {
Map<String, Object> thisUserNode = (Map<String, Object>) allUsersNode.get(usersKey);
User thisUser = ph.createUser(usersKey);