Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9

5 files changed, 14 insertions, 13 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/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index d415182b0..3daea93eb 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -391,7 +391,7 @@ public class GroupManager extends JavaPlugin {
 			senderPlayer = (Player) sender;
 
 			if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
-				sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. Check the log and then try a '/manload'.)");
+				sender.sendMessage(ChatColor.RED + "All commands are locked due to an error." + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check the log" + ChatColor.RESET + " and then try a '/manload'.");
 				return true;
 			}
 
@@ -406,7 +406,7 @@ public class GroupManager extends JavaPlugin {
 		} else if (sender instanceof ConsoleCommandSender) {
 
 			if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
-				sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. Check the log and then try a '/manload'.)");
+				sender.sendMessage(ChatColor.RED + "All commands are locked due to an error." + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check the log" + ChatColor.RESET + " and then try a '/manload'.");
 				return true;
 			}
 
@@ -1673,7 +1673,7 @@ public class GroupManager extends JavaPlugin {
 				if (args.length > 0) {
 
 					if (!lastError.isEmpty()) {
-						sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. Check the log and then try a '/manload'.)");
+						sender.sendMessage(ChatColor.RED + "All commands are locked due to an error." + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check the log" + ChatColor.RESET + " and then try a '/manload'.");
 						return true;
 					}
 
@@ -1838,7 +1838,7 @@ public class GroupManager extends JavaPlugin {
 					return false;
 				}
 				if (!isConsole && !isOpOverride && (!permissionHandler.hasGroupInInheritance(auxUser.getGroup(), auxGroup.getName()) && !permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName()))) {
-					sender.sendMessage(ChatColor.RED + "You can't modify a player using groups with different heritage line.");
+					sender.sendMessage(ChatColor.RED + "You can't modify a player using groups with different inheritage line.");
 					return false;
 				}
 				if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName()))) {
@@ -1854,9 +1854,9 @@ public class GroupManager extends JavaPlugin {
 
 			case mantogglevalidate:
 				validateOnlinePlayer = !validateOnlinePlayer;
-				sender.sendMessage(ChatColor.YELLOW + "Validade if player is online, now set to: " + Boolean.toString(validateOnlinePlayer));
+				sender.sendMessage(ChatColor.YELLOW + "Validate if player is online, now set to: " + Boolean.toString(validateOnlinePlayer));
 				if (!validateOnlinePlayer) {
-					sender.sendMessage(ChatColor.GOLD + "From now on you can edit players not connected... BUT:");
+					sender.sendMessage(ChatColor.GOLD + "From now on you can edit players that are not connected... BUT:");
 					sender.sendMessage(ChatColor.LIGHT_PURPLE + "From now on you should type the whole name of the player, correctly.");
 				}
 				return true;
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index a4b346154..263ad0cce 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -420,7 +420,7 @@ public class WorldDataHolder {
 			throw new IllegalArgumentException("The file which should contain groups does not exist!\n" + groupsFile.getPath());
 		} catch (IOException e) {
 			e.printStackTrace();
-			throw new IllegalArgumentException("Error access the groups file!\n" + groupsFile.getPath());
+			throw new IllegalArgumentException("Error accessing the groups file!\n" + groupsFile.getPath());
 		}
 
 		GroupManager.setLoaded(true);
@@ -437,7 +437,7 @@ public class WorldDataHolder {
 			throw new IllegalArgumentException("The file which should contain users does not exist!\n" + usersFile.getPath());
 		} catch (IOException e) {
 			e.printStackTrace();
-			throw new IllegalArgumentException("Error access the users file!\n" + usersFile.getPath());
+			throw new IllegalArgumentException("Error accessing the users file!\n" + usersFile.getPath());
 		}
 
 		GroupManager.setLoaded(true);
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);
diff --git a/EssentialsGroupManager/src/plugin.yml b/EssentialsGroupManager/src/plugin.yml
index 338991393..abe199aad 100644
--- a/EssentialsGroupManager/src/plugin.yml
+++ b/EssentialsGroupManager/src/plugin.yml
@@ -9,7 +9,7 @@ authors:
   - ElgarL
 commands:
   manuadd:
-    description: Move a player to desired group.(Adds to the file if not exists)
+    description: Move a player to desired group. (Adds to the file if not exists)
     usage: /<command> <player> <group> | optional [world]
     permissions: groupmanager.manuadd
   manudel:
@@ -29,7 +29,7 @@ commands:
     usage: /<command> <group>
     permissions: groupmanager.mangadd
   mangdel:
-    description: Removes group from the system(all it's users become default)
+    description: Removes group from the system (all it's users become default)
     usage: /<command> <group>
     permissions: groupmanager.mangdel
   manuaddp: