minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-11 09:05:01 +02:00
Code Issues Releases Wiki Activity

All User lookups should be case sensitive.

Browse Source
This commit is contained in:
ElgarL
2014-07-19 04:10:35 +01:00
parent 4b20b6a93a
commit e36f26e185
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
View File

@@ -118,8 +118,8 @@ public class WorldDataHolder {
*/ */
public User getUser(String userId) { public User getUser(String userId) {
if (getUsers().containsKey(userId.toLowerCase())) { if (getUsers().containsKey(userId)) {
return getUsers().get(userId.toLowerCase()); return getUsers().get(userId);
} }
// Legacy name matching // Legacy name matching
@@ -157,7 +157,7 @@ public class WorldDataHolder {
public User getUser(String uUID, String currentName) { public User getUser(String uUID, String currentName) {
// Check for a UUID account // Check for a UUID account
User user = getUsers().get(uUID.toLowerCase()); User user = getUsers().get(uUID);
if (user != null) { if (user != null) {
@@ -168,9 +168,9 @@ public class WorldDataHolder {
} }
// Search for a LastName match // Search for a LastName match
user = getUsers().get(currentName.toLowerCase()); user = getUsers().get(currentName);
if ((user != null) && user.getLastName().equalsIgnoreCase(currentName) && user.getUUID().equalsIgnoreCase(user.getLastName())) { if ((user != null) && user.getLastName().equals(currentName) && user.getUUID().equals(user.getLastName())) {
// Clone this user so we can set it's uUID // Clone this user so we can set it's uUID
User usr = user.clone(uUID, currentName); User usr = user.clone(uUID, currentName);
@@ -181,7 +181,7 @@ public class WorldDataHolder {
GroupManager.logger.fine("Updating User record for UUID: " + uUID + ":" + currentName); GroupManager.logger.fine("Updating User record for UUID: " + uUID + ":" + currentName);
return getUsers().get(uUID.toLowerCase()); return getUsers().get(uUID);
} }
if (user != null) { if (user != null) {
@@ -214,7 +214,7 @@ public class WorldDataHolder {
theUser.setGroup(groups.getDefaultGroup()); theUser.setGroup(groups.getDefaultGroup());
} }
removeUser(theUser.getUUID()); removeUser(theUser.getUUID());
getUsers().put(theUser.getUUID().toLowerCase(), theUser); getUsers().put(theUser.getUUID(), theUser);
// Store for name to UUID lookups. // Store for name to UUID lookups.
//putUUIDLookup(theUser.getLastName(), theUser.getUUID().toLowerCase()); //putUUIDLookup(theUser.getLastName(), theUser.getUUID().toLowerCase());
@@ -232,14 +232,14 @@ public class WorldDataHolder {
*/ */
public boolean removeUser(String userId) { public boolean removeUser(String userId) {
if (getUsers().containsKey(userId.toLowerCase())) { if (getUsers().containsKey(userId)) {
User user = getUser(userId.toLowerCase()); User user = getUser(userId);
// Remove the name to UUID lookup for this user object. // Remove the name to UUID lookup for this user object.
removeUUIDLookup(user.getLastName(), user.getUUID()); removeUUIDLookup(user.getLastName(), user.getUUID());
getUsers().remove(userId.toLowerCase()); getUsers().remove(userId);
setUsersChanged(true); setUsersChanged(true);
@@ -258,7 +258,7 @@ public class WorldDataHolder {
*/ */
public boolean isUserDeclared(String userId) { public boolean isUserDeclared(String userId) {
return getUsers().containsKey(userId.toLowerCase()); return getUsers().containsKey(userId);
} }
/** /**
@@ -374,7 +374,7 @@ public class WorldDataHolder {
*/ */
public User createUser(String userId) { public User createUser(String userId) {
if (getUsers().containsKey(userId.toLowerCase())) { if (getUsers().containsKey(userId)) {
return null; return null;
} }
User newUser = new User(this, userId); User newUser = new User(this, userId);