Fix Overloaded and non-overloaded users to report correctly for group tests.

3 files changed, 12 insertions, 11 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index 6d0777411..0679b7f14 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -234,4 +234,5 @@ v2.1:
 	- Added metrics.

 	- Prevent GM's own permission tests from allowing inherited permissions to override inherited negations (caused when we added the exception override for sub groups).

 	- Add internal name to UUID resolution to speed data lookups.

-	- Convert all User lookups and commands to use UUIDs where possible.
\ No newline at end of file
+	- Convert all User lookups and commands to use UUIDs where possible.

+	- Fix Overloaded and non-overloaded users to report correctly for group tests.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 5efc4b057..279cd2761 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -1632,8 +1632,8 @@ public class GroupManager extends JavaPlugin {
 					sender.sendMessage(ChatColor.YELLOW + "subgroups: " + auxString);
 				}
 
-				sender.sendMessage(ChatColor.YELLOW + "Overloaded: " + ChatColor.GREEN + dataHolder.isOverloaded(auxUser.getLastName()));
-				auxGroup = dataHolder.surpassOverload(auxUser.getLastName()).getGroup();
+				sender.sendMessage(ChatColor.YELLOW + "Overloaded: " + ChatColor.GREEN + dataHolder.isOverloaded(auxUser.getUUID()));
+				auxGroup = dataHolder.surpassOverload(auxUser.getUUID()).getGroup();
 				if (!auxGroup.equals(auxUser.getGroup())) {
 					sender.sendMessage(ChatColor.YELLOW + "Original Group: " + ChatColor.GREEN + auxGroup.getName());
 				}
@@ -1668,7 +1668,7 @@ public class GroupManager extends JavaPlugin {
 				if (overloadedUsers.get(dataHolder.getName().toLowerCase()) == null) {
 					overloadedUsers.put(dataHolder.getName().toLowerCase(), new ArrayList<User>());
 				}
-				dataHolder.overloadUser(auxUser.getLastName());
+				dataHolder.overloadUser(auxUser.getUUID());
 				overloadedUsers.get(dataHolder.getName().toLowerCase()).add(dataHolder.getUser(auxUser.getUUID()));
 				sender.sendMessage(ChatColor.YELLOW + "Player set to overload mode!");
 
@@ -1702,7 +1702,7 @@ public class GroupManager extends JavaPlugin {
 				if (overloadedUsers.get(dataHolder.getName().toLowerCase()) == null) {
 					overloadedUsers.put(dataHolder.getName().toLowerCase(), new ArrayList<User>());
 				}
-				dataHolder.removeOverload(auxUser.getLastName());
+				dataHolder.removeOverload(auxUser.getUUID());
 				if (overloadedUsers.get(dataHolder.getName().toLowerCase()).contains(auxUser)) {
 					overloadedUsers.get(dataHolder.getName().toLowerCase()).remove(auxUser);
 				}
@@ -1721,7 +1721,7 @@ public class GroupManager extends JavaPlugin {
 				removeList = new ArrayList<User>();
 				count = 0;
 				for (User u : overloadedUsers.get(dataHolder.getName().toLowerCase())) {
-					if (!dataHolder.isOverloaded(u.getLastName())) {
+					if (!dataHolder.isOverloaded(u.getUUID())) {
 						removeList.add(u);
 					} else {
 						auxString += u.getLastName() + ", ";
@@ -1751,8 +1751,8 @@ public class GroupManager extends JavaPlugin {
 				removeList = new ArrayList<User>();
 				count = 0;
 				for (User u : overloadedUsers.get(dataHolder.getName().toLowerCase())) {
-					if (dataHolder.isOverloaded(u.getLastName())) {
-						dataHolder.removeOverload(u.getLastName());
+					if (dataHolder.isOverloaded(u.getUUID())) {
+						dataHolder.removeOverload(u.getUUID());
 						count++;
 					}
 				}
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
index 6b494b03c..974e8467e 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java
@@ -41,16 +41,16 @@ public class OverloadedWorldHolder extends WorldDataHolder {
 	 * @return user object or a new user if none exists.
 	 */
 	@Override
-	public User getUser(String userName) {
+	public User getUser(String userId) {
 
 		//OVERLOADED CODE
-		String userNameLowered = userName.toLowerCase();
+		String userNameLowered = userId.toLowerCase();
 		if (overloadedUsers.containsKey(userNameLowered)) {
 			return overloadedUsers.get(userNameLowered);
 		}
 		//END CODE
 
-		return super.getUser(userName);
+		return super.getUser(userId);
 	}
 
 	/**