From d86d72eeb75593c3125f876a8cfcf199eba12352 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Fri, 20 Jun 2014 08:51:41 +0100 Subject: Prevent NPEs on new user creation. --- .../groupmanager/dataholder/WorldDataHolder.java | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java index 3b0132617..4a1d6506a 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java @@ -162,22 +162,26 @@ public class WorldDataHolder { } // Search for a LastName match - for (String uid : getUUIDLookup(currentName)) { - - User usr = getUsers().get(uid); + + if (nameToUUIDLookup.containsKey(currentName)) { - 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()); } - } -- cgit v1.2.3