diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-11-11 14:54:19 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-11-11 14:54:19 +0000 |
commit | f52e0ae7a8cff550f30707da8172dd501e84b7c6 (patch) | |
tree | 19e299af5da1aee1d7df2f92f672e616def904e7 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder | |
parent | 0d610f761b7981f885f07c523cf8d7c2cdf8ea35 (diff) | |
parent | a370a8e01c7814d4b5fc3f4db7ee45dd5a248f60 (diff) | |
download | Essentials-f52e0ae7a8cff550f30707da8172dd501e84b7c6.tar Essentials-f52e0ae7a8cff550f30707da8172dd501e84b7c6.tar.gz Essentials-f52e0ae7a8cff550f30707da8172dd501e84b7c6.tar.lz Essentials-f52e0ae7a8cff550f30707da8172dd501e84b7c6.tar.xz Essentials-f52e0ae7a8cff550f30707da8172dd501e84b7c6.zip |
Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 4 | ||||
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 4 |
2 files changed, 4 insertions, 4 deletions
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); |