mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-11 00:55:10 +02:00
Prevent NPEs on new user creation.
This commit is contained in:
@@ -162,22 +162,26 @@ public class WorldDataHolder {
|
||||
}
|
||||
|
||||
// Search for a LastName match
|
||||
for (String uid : getUUIDLookup(currentName)) {
|
||||
|
||||
if (nameToUUIDLookup.containsKey(currentName)) {
|
||||
|
||||
User usr = getUsers().get(uid);
|
||||
|
||||
if (usr.getLastName().equalsIgnoreCase(currentName) && usr.getUUID().equalsIgnoreCase(usr.getLastName())) {
|
||||
for (String uid : getUUIDLookup(currentName)) {
|
||||
|
||||
// Clone this user so we can set it's uUID
|
||||
user = usr.clone(uUID, currentName);
|
||||
User usr = getUsers().get(uid);
|
||||
|
||||
// Delete it and replace with the new clone.
|
||||
this.removeUser(usr.getUUID());
|
||||
this.addUser(user);
|
||||
if (usr.getLastName().equalsIgnoreCase(currentName) && usr.getUUID().equalsIgnoreCase(usr.getLastName())) {
|
||||
|
||||
// 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());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user