1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-11 09:05:01 +02:00

Prevent NPEs on new user creation.

This commit is contained in:
ElgarL
2014-06-20 08:51:41 +01:00
parent f336e54b67
commit d86d72eeb7

View File

@@ -162,22 +162,26 @@ public class WorldDataHolder {
} }
// Search for a LastName match // Search for a LastName match
for (String uid : getUUIDLookup(currentName)) {
if (nameToUUIDLookup.containsKey(currentName)) {
User usr = getUsers().get(uid); for (String uid : getUUIDLookup(currentName)) {
if (usr.getLastName().equalsIgnoreCase(currentName) && usr.getUUID().equalsIgnoreCase(usr.getLastName())) {
// Clone this user so we can set it's uUID User usr = getUsers().get(uid);
user = usr.clone(uUID, currentName);
// Delete it and replace with the new clone. if (usr.getLastName().equalsIgnoreCase(currentName) && usr.getUUID().equalsIgnoreCase(usr.getLastName())) {
this.removeUser(usr.getUUID());
this.addUser(user); // Clone this user so we can set it's uUID
user = usr.clone(uUID, currentName);
// Delete it and replace with the new clone.
this.removeUser(usr.getUUID());
this.addUser(user);
return getUsers().get(uUID.toLowerCase());
}
return getUsers().get(uUID.toLowerCase());
} }
} }