User loading cleanup

2 files changed, 7 insertions, 16 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 1383c65d9..36c36c602 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -632,12 +632,14 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		return null;
 	}
 
+	//This will return null if there is not a match.
 	@Override
 	public User getUser(final String base)
 	{
 		return getOfflineUser((String)base);
 	}
 
+	//This will return null if there is not a match.
 	@Override
 	public User getOfflineUser(final String name)
 	{
@@ -649,6 +651,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 		return user;
 	}
 
+	//This will create a new user if there is not a match.
 	@Override
 	public User getUser(final Player base)
 	{
diff --git a/Essentials/src/com/earth2me/essentials/UserMap.java b/Essentials/src/com/earth2me/essentials/UserMap.java
index c96dd0343..2b2f26a1a 100644
--- a/Essentials/src/com/earth2me/essentials/UserMap.java
+++ b/Essentials/src/com/earth2me/essentials/UserMap.java
@@ -78,24 +78,12 @@ public class UserMap extends CacheLoader<String, User> implements IConf
 	}
 
 	@Override
-	public User load(final String name) throws Exception
+	public User load(final String sanitizedName) throws Exception
 	{
-		String sanitizedName = StringUtil.sanitizeFileName(name);
-		if (!sanitizedName.equals(name))
-		{
-			User user = getUser(sanitizedName);
-			if (user == null)
-			{
-				throw new Exception("User not found!");
-			}
-			else
-			{
-				return user;
-			}
-		}
 		for (Player player : ess.getServer().getOnlinePlayers())
-		{
-			if (player.getName().equalsIgnoreCase(name))
+		{			
+			String sanitizedPlayer = StringUtil.sanitizeFileName(player.getName());
+			if (sanitizedPlayer.equalsIgnoreCase(sanitizedName))
 			{
 				keys.add(sanitizedName);
 				return new User(player, ess);