minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 01:54:25 +02:00
Code Issues Releases Wiki Activity

Stop throwing errors on an empty users file.

Browse Source
This commit is contained in:
ElgarL
2011-11-21 09:51:31 +00:00
parent e33c2940be
commit 0c1d9d4e21
2 changed files with 65 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
EssentialsGroupManager/src/Changelog.txt
View File

@@ -75,3 +75,4 @@ v 1.5:
- Fixed a crash on reload due to bukkit not unloading plugins before reloading. - Fixed a crash on reload due to bukkit not unloading plugins before reloading.
v 1.6: v 1.6:
- Prevent Group.equals tests throwing a NullPointerException for GlobalGroups. - Prevent Group.equals tests throwing a NullPointerException for GlobalGroups.
- Stop throwing errors on an empty users file.

8
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
View File

@@ -711,10 +711,8 @@ public class WorldDataHolder {
// PROCESS USERS FILE // PROCESS USERS FILE
Map<String, Object> allUsersNode = (Map<String, Object>) usersRootDataNode.get("users"); Map<String, Object> allUsersNode = (Map<String, Object>) usersRootDataNode.get("users");
// Stop loading if the file is empty // Load users if the file is NOT empty
if (allUsersNode == null) if (allUsersNode != null)
return ;
for (String usersKey : allUsersNode.keySet()) { for (String usersKey : allUsersNode.keySet()) {
Map<String, Object> thisUserNode = (Map<String, Object>) allUsersNode.get(usersKey); Map<String, Object> thisUserNode = (Map<String, Object>) allUsersNode.get(usersKey);
User thisUser = ph.createUser(usersKey); User thisUser = ph.createUser(usersKey);
@@ -781,8 +779,6 @@ public class WorldDataHolder {
// Update the LastModified time. // Update the LastModified time.
ph.usersFile = usersFile; ph.usersFile = usersFile;
ph.setTimeStampUsers(usersFile.lastModified()); ph.setTimeStampUsers(usersFile.lastModified());
//return ph;
} }
/** /**