diff options
author | snowleo <schneeleo@gmail.com> | 2011-10-11 12:51:53 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-10-11 12:51:53 +0200 |
commit | 997fb1e28f341f5319099192ad0b09928a913613 (patch) | |
tree | c6dbe3852afaaaadc35274125714e745d647f777 /EssentialsGroupManager | |
parent | 8448ab3e962f5559224977cf0fcb3dd95fb5deea (diff) | |
parent | 7a03eeca1b539ed636f2bea8c44c88ecc05d40df (diff) | |
download | Essentials-997fb1e28f341f5319099192ad0b09928a913613.tar Essentials-997fb1e28f341f5319099192ad0b09928a913613.tar.gz Essentials-997fb1e28f341f5319099192ad0b09928a913613.tar.lz Essentials-997fb1e28f341f5319099192ad0b09928a913613.tar.xz Essentials-997fb1e28f341f5319099192ad0b09928a913613.zip |
Merge branch 'master' into groupmanager
Diffstat (limited to 'EssentialsGroupManager')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java | 4 | ||||
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 49cee6001..cf8075377 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -159,7 +159,7 @@ public class GroupManager extends JavaPlugin { } }; scheduler = new ScheduledThreadPoolExecutor(1); - int minutes = getConfig().getSaveInterval(); + int minutes = getGMConfig().getSaveInterval(); scheduler.scheduleAtFixedRate(commiter, minutes, minutes, TimeUnit.MINUTES); GroupManager.logger.info("Scheduled Data Saving is set for every " + minutes + " minutes!"); } @@ -1755,7 +1755,7 @@ public class GroupManager extends JavaPlugin { /** * @return the config */ - public GMConfiguration getConfig() { + public GMConfiguration getGMConfig() { return config; } diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 50e6ef547..0bcf9a827 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -111,7 +111,7 @@ public class WorldsHolder { @SuppressWarnings("rawtypes") public void mirrorSetUp() { mirrors.clear(); - Map<String, Object> mirrorsMap = plugin.getConfig().getMirrorsMap(); + Map<String, Object> mirrorsMap = plugin.getGMConfig().getMirrorsMap(); if (mirrorsMap != null) { for (String source : mirrorsMap.keySet()) { // Make sure all non mirrored worlds have a set of data files. |