summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2012-01-13 01:38:54 +0100
committersnowleo <schneeleo@gmail.com>2012-01-13 01:38:54 +0100
commit4884bed11777cb3fe3e6dfb7c9f328e7cfeb23d4 (patch)
tree65f9f62d317b2eeee3a6ee5533f7fbcdbc52fa86 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
parent3fdde2f7641e681ba9d53f9f161a22214a64ea11 (diff)
parent58057a771d4e8e971d8531e1ad208eb6bbb0df54 (diff)
downloadEssentials-4884bed11777cb3fe3e6dfb7c9f328e7cfeb23d4.tar
Essentials-4884bed11777cb3fe3e6dfb7c9f328e7cfeb23d4.tar.gz
Essentials-4884bed11777cb3fe3e6dfb7c9f328e7cfeb23d4.tar.lz
Essentials-4884bed11777cb3fe3e6dfb7c9f328e7cfeb23d4.tar.xz
Essentials-4884bed11777cb3fe3e6dfb7c9f328e7cfeb23d4.zip
Merge branch 'refs/heads/groupmanager'
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java19
1 files changed, 10 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 25eaf8526..dbdd17f34 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
@@ -176,6 +176,16 @@ public class WorldsHolder {
ArrayList<WorldDataHolder> alreadyDone = new ArrayList<WorldDataHolder>();
Tasks.removeOldFiles(plugin, plugin.getBackupFolder());
+ // Write Global Groups
+ if (GroupManager.getGlobalGroups().haveGroupsChanged()) {
+ GroupManager.getGlobalGroups().writeGroups(overwrite);
+ } else {
+ if (GroupManager.getGlobalGroups().getTimeStampGroups() < GroupManager.getGlobalGroups().getGlobalGroupsFile().lastModified()) {
+ System.out.print("Newer GlobalGroups file found (Loading changes)!");
+ GroupManager.getGlobalGroups().load();
+ }
+ }
+
for (OverloadedWorldHolder w : worldsData.values()) {
if (alreadyDone.contains(w)) {
continue;
@@ -228,15 +238,6 @@ public class WorldsHolder {
}
alreadyDone.add(w);
}
- // Write Global Groups
- if (GroupManager.getGlobalGroups().haveGroupsChanged()) {
- GroupManager.getGlobalGroups().writeGroups(overwrite);
- } else {
- if (GroupManager.getGlobalGroups().getTimeStampGroups() < GroupManager.getGlobalGroups().getGlobalGroupsFile().lastModified()) {
- System.out.print("Newer GlobalGroups file found (Loading changes)!");
- GroupManager.getGlobalGroups().load();
- }
- }
}
/**