From 2e0a1dde857492e83d917fa2888a5ddf67d17b6d Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@Palmergames.com>
Date: Thu, 19 Jun 2014 17:29:20 +0100
Subject: Fix NPE when adding name to UUID key before the name has been set.

---
 .../src/org/anjocaido/groupmanager/data/DataUnit.java                   | 2 ++
 .../src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'EssentialsGroupManager/src/org')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
index 90fd28e8d..80032fd12 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java
@@ -110,6 +110,8 @@ public abstract class DataUnit {
 		if (!lastName.equals(this.lastName)) {
 			
 			this.lastName = lastName;
+			dataSource.putUUIDLookup(lastName, uUID);
+			
 			changed = true;
 			
 		}
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index 9c5a9959f..0373694a6 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -208,7 +208,7 @@ public class WorldDataHolder {
 		getUsers().put(theUser.getUUID().toLowerCase(), theUser);
 		
 		// Store for name to UUID lookups.
-		putUUIDLookup(theUser.getLastName(), theUser.getUUID().toLowerCase());
+		//putUUIDLookup(theUser.getLastName(), theUser.getUUID().toLowerCase());
 		
 		setUsersChanged(true);
 		if (GroupManager.isLoaded())
-- 
cgit v1.2.3