summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2011-10-16 01:23:25 +0100
committerElgarL <ElgarL@palmergames.com>2011-10-16 01:23:25 +0100
commit9a1084ede94c8505adad28d3548dfbffadfc5ca6 (patch)
tree2cd4ea08fac81bae811e366548a47fae027f45f0 /EssentialsGroupManager
parentae8500fad4c101dfeab8179a6938d418bd3410c4 (diff)
downloadEssentials-9a1084ede94c8505adad28d3548dfbffadfc5ca6.tar
Essentials-9a1084ede94c8505adad28d3548dfbffadfc5ca6.tar.gz
Essentials-9a1084ede94c8505adad28d3548dfbffadfc5ca6.tar.lz
Essentials-9a1084ede94c8505adad28d3548dfbffadfc5ca6.tar.xz
Essentials-9a1084ede94c8505adad28d3548dfbffadfc5ca6.zip
Fixed reading world mirrors from the config.
Diffstat (limited to 'EssentialsGroupManager')
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java6
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java8
3 files changed, 9 insertions, 8 deletions
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<String, Object> getMirrorsMap() {
- return (Map<String, Object>) GMconfig.getList("settings.permission.world.mirror");
+ public Map<String, Object> getMirrorsMap() {
+
+ return (Map<String, Object>) 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());
+
}
}
}