Skip to content

Commit e36f26e

Browse files
committed
All User lookups should be case sensitive.
1 parent 4b20b6a commit e36f26e

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ public void updateDataSource() {
118118
*/
119119
public User getUser(String userId) {
120120

121-
if (getUsers().containsKey(userId.toLowerCase())) {
122-
return getUsers().get(userId.toLowerCase());
121+
if (getUsers().containsKey(userId)) {
122+
return getUsers().get(userId);
123123
}
124124

125125
// Legacy name matching
@@ -157,7 +157,7 @@ public User getUser(String userId) {
157157
public User getUser(String uUID, String currentName) {
158158

159159
// Check for a UUID account
160-
User user = getUsers().get(uUID.toLowerCase());
160+
User user = getUsers().get(uUID);
161161

162162
if (user != null) {
163163

@@ -168,9 +168,9 @@ public User getUser(String uUID, String currentName) {
168168
}
169169

170170
// Search for a LastName match
171-
user = getUsers().get(currentName.toLowerCase());
171+
user = getUsers().get(currentName);
172172

173-
if ((user != null) && user.getLastName().equalsIgnoreCase(currentName) && user.getUUID().equalsIgnoreCase(user.getLastName())) {
173+
if ((user != null) && user.getLastName().equals(currentName) && user.getUUID().equals(user.getLastName())) {
174174

175175
// Clone this user so we can set it's uUID
176176
User usr = user.clone(uUID, currentName);
@@ -181,7 +181,7 @@ public User getUser(String uUID, String currentName) {
181181

182182
GroupManager.logger.fine("Updating User record for UUID: " + uUID + ":" + currentName);
183183

184-
return getUsers().get(uUID.toLowerCase());
184+
return getUsers().get(uUID);
185185
}
186186

187187
if (user != null) {
@@ -214,7 +214,7 @@ public void addUser(User theUser) {
214214
theUser.setGroup(groups.getDefaultGroup());
215215
}
216216
removeUser(theUser.getUUID());
217-
getUsers().put(theUser.getUUID().toLowerCase(), theUser);
217+
getUsers().put(theUser.getUUID(), theUser);
218218

219219
// Store for name to UUID lookups.
220220
//putUUIDLookup(theUser.getLastName(), theUser.getUUID().toLowerCase());
@@ -232,14 +232,14 @@ public void addUser(User theUser) {
232232
*/
233233
public boolean removeUser(String userId) {
234234

235-
if (getUsers().containsKey(userId.toLowerCase())) {
235+
if (getUsers().containsKey(userId)) {
236236

237-
User user = getUser(userId.toLowerCase());
237+
User user = getUser(userId);
238238

239239
// Remove the name to UUID lookup for this user object.
240240
removeUUIDLookup(user.getLastName(), user.getUUID());
241241

242-
getUsers().remove(userId.toLowerCase());
242+
getUsers().remove(userId);
243243

244244
setUsersChanged(true);
245245

@@ -258,7 +258,7 @@ public boolean removeUser(String userId) {
258258
*/
259259
public boolean isUserDeclared(String userId) {
260260

261-
return getUsers().containsKey(userId.toLowerCase());
261+
return getUsers().containsKey(userId);
262262
}
263263

264264
/**
@@ -374,7 +374,7 @@ public boolean removeGroup(String groupName) {
374374
*/
375375
public User createUser(String userId) {
376376

377-
if (getUsers().containsKey(userId.toLowerCase())) {
377+
if (getUsers().containsKey(userId)) {
378378
return null;
379379
}
380380
User newUser = new User(this, userId);

0 commit comments

Comments
 (0)