From 778f5649c8c0b3be9cc379f61c0a767959ebdbcd Mon Sep 17 00:00:00 2001 From: ElgarL Date: Mon, 1 Oct 2012 12:05:49 +0100 Subject: allWorldsDataList now returns fully mirrored worlds whihc are not identical mirrors (fixes the /manselect list). --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'EssentialsGroupManager') 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 of all loaded worlds */ @@ -700,7 +700,7 @@ public class WorldsHolder { ArrayList list = new ArrayList(); 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); -- cgit v1.2.3 From 296af1069e78a435cb5ea9012b629fd693b94f00 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 2 Nov 2012 18:21:26 +0200 Subject: Update EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java --- .../src/org/anjocaido/groupmanager/GroupManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index ee1130483..d78473847 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -386,7 +386,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; } @@ -401,7 +401,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; } @@ -1668,7 +1668,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; } @@ -1833,7 +1833,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()))) { @@ -1849,9 +1849,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; -- cgit v1.2.3 From ef98a6b54c9423803d5dfe55a2bee642f94b7c4a Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Thu, 8 Nov 2012 16:31:49 +0200 Subject: GroupManager typo fix --- .../src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'EssentialsGroupManager') 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); -- cgit v1.2.3 From ba0db53c44a4ffcbfdf3b02c3abc6237b69e55f2 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Thu, 8 Nov 2012 16:35:57 +0200 Subject: correct spaces at plugin.yml --- EssentialsGroupManager/src/plugin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'EssentialsGroupManager') 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: / | optional [world] permissions: groupmanager.manuadd manudel: @@ -29,7 +29,7 @@ commands: usage: / 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: / permissions: groupmanager.mangdel manuaddp: -- cgit v1.2.3