From 50d3486d35f82415e35b8acd2f23cf594c5e2ae4 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@Palmergames.com>
Date: Mon, 14 Apr 2014 23:40:04 +0100
Subject: Fix overloadedWorldHolder so it correctly calls the new WorldHolder
 code when the user is not overloaded.

---
 .../anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java  | 8 ++------
 .../org/anjocaido/groupmanager/dataholder/WorldDataHolder.java    | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
index d91630a70..6b494b03c 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
@@ -49,12 +49,8 @@ public class OverloadedWorldHolder extends WorldDataHolder {
 			return overloadedUsers.get(userNameLowered);
 		}
 		//END CODE
-		if (getUsers().containsKey(userNameLowered)) {
-			return getUsers().get(userNameLowered);
-		}
-		User newUser = createUser(userName);
-		setUsersChanged(true);
-		return newUser;
+
+		return super.getUser(userName);
 	}
 
 	/**
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index 75d8ed570..14a9a052d 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -119,8 +119,9 @@ public class WorldDataHolder {
 			// Search for a LastName match
 			for (User user : getUserList()) {
 				
-				if (user.getLastName().equalsIgnoreCase(userId))
+				if (user.getLastName().equalsIgnoreCase(userId)) {
 					return user;
+				}
 			}
 			
 		}
@@ -157,14 +158,13 @@ public class WorldDataHolder {
 			if (usr.getLastName().equalsIgnoreCase(currentName)) {
 				
 				// Clone this user so we can set it's uUID
-				user = usr.clone(uUID);
+				user = usr.clone(uUID, currentName);
 				
 				// Delete it and replace with the new clone.
 				this.removeUser(usr.getUUID());
-				user.setLastName(currentName);
 				this.addUser(user);
 				
-				return user;
+				return getUsers().get(uUID.toLowerCase());
 			}
 			
 		}
-- 
cgit v1.2.3