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 | 5395b6f73a36e1e20b459e6a9c39ab6499f9d350 (patch) | |
| tree | 3765a13ee3e7bf17758967b6d7c500df4b534a1e /EssentialsGroupManager | |
| parent | a6bafca091c59cd00e65fbf7f3e1c43aac440858 (diff) | |
| parent | 5851c5a88bfafd0446f0c167de022fc16cc928ad (diff) | |
| download | Essentials-5395b6f73a36e1e20b459e6a9c39ab6499f9d350.tar Essentials-5395b6f73a36e1e20b459e6a9c39ab6499f9d350.tar.gz Essentials-5395b6f73a36e1e20b459e6a9c39ab6499f9d350.tar.lz Essentials-5395b6f73a36e1e20b459e6a9c39ab6499f9d350.tar.xz Essentials-5395b6f73a36e1e20b459e6a9c39ab6499f9d350.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. |