From 7d011cfe3adaacbc6412f6e1977f33661e50ddf5 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 24 Jan 2012 14:08:53 +0000 Subject: Added recursive loop detection for World mirroring (you may not set the main world as a mirror of another). Fixed fetching world data so it no longer returns the mirrored world for groups. Each world data holder now points to the correct data set, so can be returned as an object. --- EssentialsGroupManager/src/Changelog.txt | 4 +- .../dataholder/worlds/WorldsHolder.java | 85 +++++++++++----------- 2 files changed, 45 insertions(+), 44 deletions(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index b58f520a8..22e812dd6 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -111,4 +111,6 @@ v 1.9: - Update GroupManagerBridge for new event system. - Fixed a random null error upon a player portaling. - Fixed infinite loop error on player join. - - Optimized code to only update the player logging in instead of all players online. \ No newline at end of file + - Optimized code to only update the player logging in instead of all players online. + - Added recursive loop detection for World mirroring (you may not set the main world as a mirror of another). + - Fixed fetching world data so it no longer returns the mirrored world for groups. Each world data holder now points to the correct data set, so can be returned as an object. \ 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 1a765c7b4..a24e534be 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -130,41 +130,48 @@ public class WorldsHolder { // These worlds fully mirror their parent for (Object o : mirrorList) { - try { - mirrorsGroup.remove(o.toString().toLowerCase()); - mirrorsUser.remove(o.toString().toLowerCase()); - } catch (Exception e) { - } - mirrorsGroup.put(o.toString().toLowerCase(), getWorldData(source).getName()); - mirrorsUser.put(o.toString().toLowerCase(), getWorldData(source).getName()); + String world = o.toString().toLowerCase(); + if (world != serverDefaultWorldName) { + try { + mirrorsGroup.remove(world); + mirrorsUser.remove(world); + } catch (Exception e) { + } + mirrorsGroup.put(world, getWorldData(source).getName()); + mirrorsUser.put(world, getWorldData(source).getName()); + } else + GroupManager.logger.log(Level.WARNING, "Mirroring error with " + o.toString() + ". Recursive loop detected!"); } } else if (mirrorsMap.get(source) instanceof MemorySection) { MemorySection subSection = (MemorySection) mirrorsMap.get(source); for (String key : subSection.getKeys(true)) { - //System.out.print("Key - " + key); - if (subSection.get(key) instanceof ArrayList) { - ArrayList mirrorList = (ArrayList) subSection.get(key); - - // These worlds have defined mirroring - for (Object o : mirrorList) { - String type = o.toString().toLowerCase(); - try { - if (type.equals("groups")) - mirrorsGroup.remove(key.toLowerCase()); - - if (type.equals("users")) - mirrorsUser.remove(key.toLowerCase()); - - } catch (Exception e) { - } - if (type.equals("groups")) - mirrorsGroup.put(key.toLowerCase(), getWorldData(source).getName()); - - if (type.equals("users")) - mirrorsUser.put(key.toLowerCase(), getWorldData(source).getName()); - } + if (key.toLowerCase() != serverDefaultWorldName) { + + if (subSection.get(key) instanceof ArrayList) { + ArrayList mirrorList = (ArrayList) subSection.get(key); + + // These worlds have defined mirroring + for (Object o : mirrorList) { + String type = o.toString().toLowerCase(); + try { + if (type.equals("groups")) + mirrorsGroup.remove(key.toLowerCase()); + + if (type.equals("users")) + mirrorsUser.remove(key.toLowerCase()); + + } catch (Exception e) { + } + if (type.equals("groups")) + mirrorsGroup.put(key.toLowerCase(), getWorldData(source).getName()); + + if (type.equals("users")) + mirrorsUser.put(key.toLowerCase(), getWorldData(source).getName()); + } + } else + GroupManager.logger.log(Level.WARNING, "Mirroring error with " + key + ". Recursive loop detected!"); @@ -312,27 +319,19 @@ public class WorldsHolder { * If the world is not on the worlds list, returns the default world * holder. * - * (WHEN A WORLD IS CONFIGURED TO MIRROR, IT WILL BE ON THE LIST, BUT - * POINTING TO ANOTHER WORLD HOLDER) - * - * Mirrors prevails original data. + * Mirrors return original world data. * * @param worldName * @return OverloadedWorldHolder */ public OverloadedWorldHolder getWorldData(String worldName) { String worldNameLowered = worldName.toLowerCase(); - // If a mirror change to the real world to load. - if (mirrorsGroup.containsKey(worldNameLowered)) { - worldNameLowered = mirrorsGroup.get(worldNameLowered); - } - OverloadedWorldHolder data = worldsData.get(worldNameLowered); + + if (worldsData.containsKey(worldNameLowered)) + return worldsData.get(worldNameLowered); - if (data == null) { - GroupManager.logger.finest("Requested world " + worldName + " not found or badly mirrored. Returning default world..."); - data = getDefaultWorld(); - } - return data; + GroupManager.logger.finest("Requested world " + worldName + " not found or badly mirrored. Returning default world..."); + return getDefaultWorld(); } /** -- cgit v1.2.3 From 5f626f18662664fe226d04d91767cb913dab64f9 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 24 Jan 2012 14:21:07 +0000 Subject: addSubGroup now returns a boolean for success/failure. '/manuaddsub' now correctly reports if it was able to add the sub group. --- EssentialsGroupManager/src/Changelog.txt | 5 ++++- .../org/anjocaido/groupmanager/GroupManager.java | 6 +++-- .../src/org/anjocaido/groupmanager/data/User.java | 26 +++++++++++++--------- 3 files changed, 23 insertions(+), 14 deletions(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 22e812dd6..5d9f1fff5 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -113,4 +113,7 @@ v 1.9: - Fixed infinite loop error on player join. - Optimized code to only update the player logging in instead of all players online. - Added recursive loop detection for World mirroring (you may not set the main world as a mirror of another). - - Fixed fetching world data so it no longer returns the mirrored world for groups. Each world data holder now points to the correct data set, so can be returned as an object. \ No newline at end of file + - Fixed fetching world data so it no longer returns the mirrored world for groups. Each world data holder now points to the correct data set, so can be returned as an object. + - Changed addSubGroup() to only add the group if it doesn't already exist (no need to update an already existing group). + - addSubGroup now returns a boolean for success/failure. + - '/manuaddsub' now correctly reports if it was able to add the sub group. \ 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 d8f5418ed..c0ed77adc 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -489,8 +489,10 @@ public class GroupManager extends JavaPlugin { return false; } // PARECE OK - auxUser.addSubGroup(auxGroup); - sender.sendMessage(ChatColor.YELLOW + "You added subgroup '" + auxGroup.getName() + "' to player '" + auxUser.getName() + "'."); + if (auxUser.addSubGroup(auxGroup)) + sender.sendMessage(ChatColor.YELLOW + "You added subgroup '" + auxGroup.getName() + "' to player '" + auxUser.getName() + "'."); + else + sender.sendMessage(ChatColor.RED + "The subgroup '" + auxGroup.getName() + "' is already available to '" + auxUser.getName() + "'."); targetPlayer = this.getServer().getPlayer(auxUser.getName()); if (targetPlayer != null) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index fd66bcfa2..6e9b7ad21 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -147,22 +147,26 @@ public class User extends DataUnit implements Cloneable { } } - public void addSubGroup(Group subGroup) { + public boolean addSubGroup(Group subGroup) { + // Don't allow adding a subgroup if it's already set as the primary. if (this.group.equalsIgnoreCase(subGroup.getName())) { - return; + return false; } if (!this.getDataSource().groupExists(subGroup.getName())) { getDataSource().addGroup(subGroup); + + flagAsChanged(); + if (GroupManager.isLoaded()) { + if (!GroupManager.BukkitPermissions.isPlayer_join()) + GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer()); + GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED); + } + return true; } - subGroup = getDataSource().getGroup(subGroup.getName()); - removeSubGroup(subGroup); - subGroups.add(subGroup.getName()); - flagAsChanged(); - if (GroupManager.isLoaded()) { - if (!GroupManager.BukkitPermissions.isPlayer_join()) - GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer()); - GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED); - } + //subGroup = getDataSource().getGroup(subGroup.getName()); + //removeSubGroup(subGroup); + //subGroups.add(subGroup.getName()); + return false; } public int subGroupsSize() { -- cgit v1.2.3 From ee9fcce050c9885eb161f9bfd904834f487e80d1 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 24 Jan 2012 15:35:20 +0000 Subject: Fixed isInList --- .../src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index a24e534be..234806a95 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -540,7 +540,7 @@ public class WorldsHolder { * @return true if world is loaded or mirrored. false if not listed */ public boolean isInList(String worldName) { - if (worldsData.containsKey(worldName.toLowerCase()) || mirrorsGroup.containsKey(worldName.toLowerCase())) { + if (worldsData.containsKey(worldName.toLowerCase()) || mirrorsGroup.containsKey(worldName.toLowerCase()) || mirrorsUser.containsKey(worldName.toLowerCase())) { return true; } return false; -- cgit v1.2.3 From 6daee7b8a2d73eaef5ab74d77d86356767c0c9dd Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 24 Jan 2012 15:37:21 +0000 Subject: Fix hasOwnData to return a correct result with new mirroring system --- .../src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 234806a95..320fe3e26 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -553,7 +553,7 @@ public class WorldsHolder { * @return true if it has its own holder. false if not. */ public boolean hasOwnData(String worldName) { - if (worldsData.containsKey(worldName.toLowerCase())) { + if (worldsData.containsKey(worldName.toLowerCase()) && (!mirrorsGroup.containsKey(worldName.toLowerCase()) || !mirrorsUser.containsKey(worldName.toLowerCase()))) { return true; } return false; -- cgit v1.2.3 From 45ad79a0c2c88edceecc933114da5c719a918c9d Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 24 Jan 2012 19:38:22 +0000 Subject: Allow negations with the * permission node when population superperms. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../groupmanager/permissions/AnjoPermissionsHandler.java | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 5d9f1fff5..bec0af257 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -116,4 +116,5 @@ v 1.9: - Fixed fetching world data so it no longer returns the mirrored world for groups. Each world data holder now points to the correct data set, so can be returned as an object. - Changed addSubGroup() to only add the group if it doesn't already exist (no need to update an already existing group). - addSubGroup now returns a boolean for success/failure. - - '/manuaddsub' now correctly reports if it was able to add the sub group. \ No newline at end of file + - '/manuaddsub' now correctly reports if it was able to add the sub group. + - Allow negations with the * permission node when population superperms. \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java index 51c6dded5..e326ff624 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java @@ -150,12 +150,14 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { Set permArray = new HashSet(); - for (String perm : perms) { - - // Allow * node to populate ALL perms in Bukkit. - if (perm.equalsIgnoreCase("*")) - permArray.addAll(GroupManager.BukkitPermissions.getAllRegisteredPermissions(includeChildren)); + // Allow * node to populate ALL perms in Bukkit. + if (perms.contains("*")) { + permArray.addAll(GroupManager.BukkitPermissions.getAllRegisteredPermissions(includeChildren)); + perms.remove("*"); + } + for (String perm : perms) { + boolean negated = false; if (perm.startsWith("-")) negated = true; -- cgit v1.2.3 From 8ba637a50a8934c1c8b50507b550b62047d923d1 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Tue, 24 Jan 2012 19:41:22 +0000 Subject: Fix typo/wording in changelog Allow negation to the * permission node when populating superperms. --- EssentialsGroupManager/src/Changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index bec0af257..70f778247 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -117,4 +117,4 @@ v 1.9: - Changed addSubGroup() to only add the group if it doesn't already exist (no need to update an already existing group). - addSubGroup now returns a boolean for success/failure. - '/manuaddsub' now correctly reports if it was able to add the sub group. - - Allow negations with the * permission node when population superperms. \ No newline at end of file + - Allow negation to the * permission node when populating superperms. \ No newline at end of file -- cgit v1.2.3