summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org
diff options
context:
space:
mode:
authorElgarL <ElgarL@Palmergames.com>2014-06-19 17:29:20 +0100
committerElgarL <ElgarL@Palmergames.com>2014-06-19 17:29:20 +0100
commit2e0a1dde857492e83d917fa2888a5ddf67d17b6d (patch)
treeb918971005638a88fb350316281e15fcd0aace59 /EssentialsGroupManager/src/org
parente862e3c87b4cc98b880894877db17845370c22d9 (diff)
downloadEssentials-2e0a1dde857492e83d917fa2888a5ddf67d17b6d.tar
Essentials-2e0a1dde857492e83d917fa2888a5ddf67d17b6d.tar.gz
Essentials-2e0a1dde857492e83d917fa2888a5ddf67d17b6d.tar.lz
Essentials-2e0a1dde857492e83d917fa2888a5ddf67d17b6d.tar.xz
Essentials-2e0a1dde857492e83d917fa2888a5ddf67d17b6d.zip
Fix NPE when adding name to UUID key before the name has been set.
Diffstat (limited to 'EssentialsGroupManager/src/org')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java2
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java2
2 files changed, 3 insertions, 1 deletions
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())