From 121966436e381b96f3905301a8567b9767b2b36e Mon Sep 17 00:00:00 2001 From: ElgarL Date: Sun, 16 Oct 2011 01:23:25 +0100 Subject: Fixed reading world mirrors from the config. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../src/org/anjocaido/groupmanager/GMConfiguration.java | 6 +++--- .../anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'EssentialsGroupManager/src') diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 272a792e2..c4c8f6f20 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -45,4 +45,5 @@ v 1.4: - Cleared remaining Cast errors cause by object cloning. - Removed extra notification messages for the player issuing the group move command. - Added a config setting - bukkit_perms_override: false - Enable to allow default Bukkit based permissions to remain enabled, unless directly negated within GroupManager. \ No newline at end of file + Enable to allow default Bukkit based permissions to remain enabled, unless directly negated within GroupManager. + - Fixed reading world mirrors from the config. \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java index af21b31bb..e57ce139e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java @@ -58,9 +58,9 @@ public class GMConfiguration { return GMconfig.getBoolean("settings.config.opOverrides", true); } - @SuppressWarnings("unchecked") - public Map getMirrorsMap() { - return (Map) GMconfig.getList("settings.permission.world.mirror"); + public Map getMirrorsMap() { + + return (Map) GMconfig.getConfigurationSection("settings.permission.world.mirror").getValues(false); } public Integer getSaveInterval() { diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 0bcf9a827..573fcebc3 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -99,11 +99,11 @@ public class WorldsHolder { * don't load any worlds which are already loaded * or mirrored worlds that don't need data. */ - if (worldsData.containsKey(folder.getName().toLowerCase()) - || mirrors.containsKey(folder.getName().toLowerCase())) { - continue; + if (!worldsData.containsKey(folder.getName().toLowerCase()) + || !mirrors.containsKey(folder.getName().toLowerCase())) { + loadWorld(folder.getName()); } - loadWorld(folder.getName()); + } } } -- cgit v1.2.3