summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2012-10-01 12:05:49 +0100
committerElgarL <ElgarL@palmergames.com>2012-10-01 12:05:49 +0100
commiteaa3b12c4b9b821f20a2864a9881fe46fa4b94cc (patch)
tree49616e4480685a3e19c3c717d0bdc9b1c28d1640 /EssentialsGroupManager/src
parent717b38aad7f8f847da23fe6e1e032ba5f8481437 (diff)
downloadEssentials-eaa3b12c4b9b821f20a2864a9881fe46fa4b94cc.tar
Essentials-eaa3b12c4b9b821f20a2864a9881fe46fa4b94cc.tar.gz
Essentials-eaa3b12c4b9b821f20a2864a9881fe46fa4b94cc.tar.lz
Essentials-eaa3b12c4b9b821f20a2864a9881fe46fa4b94cc.tar.xz
Essentials-eaa3b12c4b9b821f20a2864a9881fe46fa4b94cc.zip
allWorldsDataList now returns fully mirrored worlds whihc are not
identical mirrors (fixes the /manselect list).
Diffstat (limited to 'EssentialsGroupManager/src')
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java4
2 files changed, 4 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 0c9b13a47..077ea9163 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -200,4 +200,5 @@ v 2.0:
- Fix Synchronization on adding subgroups (thanks snowleo).
- Remove info node support from GlobalGroups. It should not have them as GlobalGroups are only permission collections.
- Change order of data in Users.yml to [name, Group, SubGroup, Permissions, Info nodes].
- - Add alphabetically sorted user lists. \ No newline at end of file
+ - Add alphabetically sorted user lists.
+ - allWorldsDataList now returns fully mirrored worlds which are not identical mirrors (fixes the /manselect list). \ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
index f84262eeb..92fec7737 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
@@ -692,7 +692,7 @@ public class WorldsHolder {
/**
* Returns all physically loaded worlds which have at least
- * one of their own data sets for users or groups.
+ * one of their own data sets for users or groups which isn't an identical mirror.
*
* @return ArrayList<OverloadedWorldHolder> of all loaded worlds
*/
@@ -700,7 +700,7 @@ public class WorldsHolder {
ArrayList<OverloadedWorldHolder> list = new ArrayList<OverloadedWorldHolder>();
for (OverloadedWorldHolder data : worldsData.values()) {
- if ((!list.contains(data)) && (!mirrorsGroup.containsKey(data.getName().toLowerCase()) || !mirrorsUser.containsKey(data.getName().toLowerCase()))) {
+ if ((!list.contains(data))) { // && (!mirrorsGroup.containsKey(data.getName().toLowerCase()) || !mirrorsUser.containsKey(data.getName().toLowerCase()))) {
String worldNameLowered = data.getName().toLowerCase();
String usersMirror = mirrorsUser.get(worldNameLowered);