diff options
| author | snowleo <schneeleo@gmail.com> | 2011-11-25 21:12:38 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-11-25 21:12:38 +0100 |
| commit | 6ba02c7f74652565b2918e1591bee4c56adf6e34 (patch) | |
| tree | bf6b9f61a3c0eb7f0a8d4f0b28b6144dfa607d0f /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder | |
| parent | cc155b145b8b51e34c0031ae22b5f14c8b6d196a (diff) | |
| parent | befbb4d0e51db31270c9d7b42fc3e4c3b8983b08 (diff) | |
| download | Essentials-6ba02c7f74652565b2918e1591bee4c56adf6e34.tar Essentials-6ba02c7f74652565b2918e1591bee4c56adf6e34.tar.gz Essentials-6ba02c7f74652565b2918e1591bee4c56adf6e34.tar.lz Essentials-6ba02c7f74652565b2918e1591bee4c56adf6e34.tar.xz Essentials-6ba02c7f74652565b2918e1591bee4c56adf6e34.zip | |
Merge branch 'refs/heads/groupmanager'
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder')
2 files changed, 9 insertions, 7 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java index e7fa81627..8e2df5d10 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java @@ -44,12 +44,13 @@ public class OverloadedWorldHolder extends WorldDataHolder { @Override public User getUser(String userName) { //OVERLOADED CODE - if (overloadedUsers.containsKey(userName.toLowerCase())) { - return overloadedUsers.get(userName.toLowerCase()); + String userNameLowered = userName.toLowerCase(); + if (overloadedUsers.containsKey(userNameLowered)) { + return overloadedUsers.get(userNameLowered); } //END CODE - if (users.containsKey(userName.toLowerCase())) { - return users.get(userName.toLowerCase()); + if (users.containsKey(userNameLowered)) { + return users.get(userNameLowered); } User newUser = createUser(userName); haveUsersChanged = true; diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 6544bb1cc..25eaf8526 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -268,9 +268,10 @@ public class WorldsHolder { * @return OverloadedWorldHolder */ public OverloadedWorldHolder getWorldData(String worldName) { - OverloadedWorldHolder data = worldsData.get(worldName.toLowerCase()); - if (mirrors.containsKey(worldName.toLowerCase())) { - String realOne = mirrors.get(worldName.toLowerCase()); + String worldNameLowered = worldName.toLowerCase(); + OverloadedWorldHolder data = worldsData.get(worldNameLowered); + if (mirrors.containsKey(worldNameLowered)) { + String realOne = mirrors.get(worldNameLowered); data = worldsData.get(realOne.toLowerCase()); } if (data == null) { |