TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-06 12:33:03 +00:00
Code Issues Projects Releases Wiki Activity

Added recursive loop detection for World mirroring (you may not set the

Browse source 
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.
This commit is contained in:
ElgarL 2012-01-24 14:08:53 +00:00
parent 125ea7c701
commit 1dab4f95dd
2 changed files with 45 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
EssentialsGroupManager/src/Changelog.txt
View file

@ -111,4 +111,6 @@ v 1.9:
- Update GroupManagerBridge for new event system. - Update GroupManagerBridge for new event system.
- Fixed a random null error upon a player portaling. - Fixed a random null error upon a player portaling.
- Fixed infinite loop error on player join. - Fixed infinite loop error on player join.
- Optimized code to only update the player logging in instead of all players online. - 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.

85
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java
View file

@ -130,41 +130,48 @@ public class WorldsHolder {
// These worlds fully mirror their parent // These worlds fully mirror their parent
for (Object o : mirrorList) { for (Object o : mirrorList) {
try { String world = o.toString().toLowerCase();
mirrorsGroup.remove(o.toString().toLowerCase()); if (world != serverDefaultWorldName) {
mirrorsUser.remove(o.toString().toLowerCase()); try {
} catch (Exception e) { mirrorsGroup.remove(world);
} mirrorsUser.remove(world);
mirrorsGroup.put(o.toString().toLowerCase(), getWorldData(source).getName()); } catch (Exception e) {
mirrorsUser.put(o.toString().toLowerCase(), getWorldData(source).getName()); }
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) { } else if (mirrorsMap.get(source) instanceof MemorySection) {
MemorySection subSection = (MemorySection) mirrorsMap.get(source); MemorySection subSection = (MemorySection) mirrorsMap.get(source);
for (String key : subSection.getKeys(true)) { for (String key : subSection.getKeys(true)) {
//System.out.print("Key - " + key);
if (subSection.get(key) instanceof ArrayList) { if (key.toLowerCase() != serverDefaultWorldName) {
ArrayList mirrorList = (ArrayList) subSection.get(key);
if (subSection.get(key) instanceof ArrayList) {
// These worlds have defined mirroring ArrayList mirrorList = (ArrayList) subSection.get(key);
for (Object o : mirrorList) {
String type = o.toString().toLowerCase(); // These worlds have defined mirroring
try { for (Object o : mirrorList) {
if (type.equals("groups")) String type = o.toString().toLowerCase();
mirrorsGroup.remove(key.toLowerCase()); try {
if (type.equals("groups"))
if (type.equals("users")) mirrorsGroup.remove(key.toLowerCase());
mirrorsUser.remove(key.toLowerCase());
if (type.equals("users"))
} catch (Exception e) { mirrorsUser.remove(key.toLowerCase());
}
if (type.equals("groups")) } catch (Exception e) {
mirrorsGroup.put(key.toLowerCase(), getWorldData(source).getName()); }
if (type.equals("groups"))
if (type.equals("users")) mirrorsGroup.put(key.toLowerCase(), getWorldData(source).getName());
mirrorsUser.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 * If the world is not on the worlds list, returns the default world
* holder. * holder.
* *
* (WHEN A WORLD IS CONFIGURED TO MIRROR, IT WILL BE ON THE LIST, BUT * Mirrors return original world data.
* POINTING TO ANOTHER WORLD HOLDER)
*
* Mirrors prevails original data.
* *
* @param worldName * @param worldName
* @return OverloadedWorldHolder * @return OverloadedWorldHolder
*/ */
public OverloadedWorldHolder getWorldData(String worldName) { public OverloadedWorldHolder getWorldData(String worldName) {
String worldNameLowered = worldName.toLowerCase(); String worldNameLowered = worldName.toLowerCase();
// If a mirror change to the real world to load.
if (mirrorsGroup.containsKey(worldNameLowered)) { if (worldsData.containsKey(worldNameLowered))
worldNameLowered = mirrorsGroup.get(worldNameLowered); return worldsData.get(worldNameLowered);
}
OverloadedWorldHolder data = worldsData.get(worldNameLowered);
if (data == null) { GroupManager.logger.finest("Requested world " + worldName + " not found or badly mirrored. Returning default world...");
GroupManager.logger.finest("Requested world " + worldName + " not found or badly mirrored. Returning default world..."); return getDefaultWorld();
data = getDefaultWorld();
}
return data;
} }
/** /**