diff options
author | snowleo <schneeleo@gmail.com> | 2011-09-17 13:19:47 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-09-17 13:19:47 +0200 |
commit | 1df79bc9f4e5dd378bbc3d18877a05d02f0d0ce9 (patch) | |
tree | dc9b043d5ea26854a23387ed0ef6a9f4d82e7a52 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds | |
parent | ab590af9272b4381e55a3061d07a83e917613401 (diff) | |
parent | 73b5fe971f1dc77c008373652c49efa53b86990e (diff) | |
download | Essentials-1df79bc9f4e5dd378bbc3d18877a05d02f0d0ce9.tar Essentials-1df79bc9f4e5dd378bbc3d18877a05d02f0d0ce9.tar.gz Essentials-1df79bc9f4e5dd378bbc3d18877a05d02f0d0ce9.tar.lz Essentials-1df79bc9f4e5dd378bbc3d18877a05d02f0d0ce9.tar.xz Essentials-1df79bc9f4e5dd378bbc3d18877a05d02f0d0ce9.zip |
GroupManager 1.1
Merge branch 'groupmanager'
Conflicts:
EssentialsGroupManager/src/plugin.yml
EssentialsGroupManager/src/users.yml
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 83073c10b..a2c34be16 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -37,7 +37,7 @@ public class WorldsHolder { * Map of mirrors: <nonExistingWorldName, existingAndLoadedWorldName> * The key is the mirror. * The object is the mirrored. - * + * * Mirror shows the same data of mirrored. */ private Map<String, String> mirrors = new HashMap<String, String>(); @@ -63,7 +63,8 @@ public class WorldsHolder { initialWorldLoading(); mirrorSetUp(); } - private void initialWorldLoading(){ + + private void initialWorldLoading() { //LOAD EVERY WORLD POSSIBLE loadWorld(serverDefaultWorldName); defaultWorld = worldsData.get(serverDefaultWorldName); @@ -77,7 +78,9 @@ public class WorldsHolder { } } } - public void mirrorSetUp(){ + + @SuppressWarnings("rawtypes") + public void mirrorSetUp() { mirrors.clear(); Map<String, Object> mirrorsMap = plugin.getConfig().getMirrorsMap(); if (mirrorsMap != null) { @@ -122,7 +125,7 @@ public class WorldsHolder { } /** - * + * */ public void saveChanges() { ArrayList<WorldDataHolder> alreadyDone = new ArrayList<WorldDataHolder>(); @@ -136,7 +139,7 @@ public class WorldsHolder { continue; } if (w.haveGroupsChanged()) { - String groupsFolderName = w.getGroupsFile().getParentFile().getName(); + //String groupsFolderName = w.getGroupsFile().getParentFile().getName(); File backupGroups = new File(plugin.getBackupFolder(), "bkp_" + w.getName() + "_g_" + Tasks.getDateString() + ".yml"); try { Tasks.copy(w.getGroupsFile(), backupGroups); @@ -262,7 +265,7 @@ public class WorldsHolder { File groupsFile = new File(defaultWorldFolder, "groups.yml"); File usersFile = new File(defaultWorldFolder, "users.yml"); File oldDataFile = new File(plugin.getDataFolder(), "data.yml"); - if (!groupsFile.exists()) { + if (!groupsFile.exists() || groupsFile.length() == 0) { if (oldDataFile.exists()) { try { Tasks.copy(oldDataFile, groupsFile); @@ -278,7 +281,7 @@ public class WorldsHolder { } } } - if (!usersFile.exists()) { + if (!usersFile.exists() || usersFile.length() == 0) { if (oldDataFile.exists()) { try { Tasks.copy(oldDataFile, usersFile); @@ -368,7 +371,7 @@ public class WorldsHolder { GroupManager.logger.log(Level.SEVERE, null, ex); return; } - GroupManager.logger.severe("Failed to load world " + worldName + "..."); + //GroupManager.logger.severe("Failed to load world " + worldName + "..."); } } @@ -376,7 +379,7 @@ public class WorldsHolder { * Tells if the such world has been mapped. * * It will return true if world is a mirror. - * + * * @param worldName * @return true if world is loaded or mirrored. false if not listed */ |