TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-05-06 15:50:43 +00:00
Code Issues Projects Releases Wiki Activity

User loading cleanup

Browse source
This commit is contained in:
KHobbits 2014-03-03 09:01:07 +00:00
parent b0e165546e
commit 9ec0ca25a5
2 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Essentials/src/com/earth2me/essentials/Essentials.java
View file

@ -632,12 +632,14 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
return null; return null;
} }
//This will return null if there is not a match.
@Override @Override
public User getUser(final String base) public User getUser(final String base)
{ {
return getOfflineUser((String)base); return getOfflineUser((String)base);
} }
//This will return null if there is not a match.
@Override @Override
public User getOfflineUser(final String name) public User getOfflineUser(final String name)
{ {
@ -649,6 +651,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
return user; return user;
} }
//This will create a new user if there is not a match.
@Override @Override
public User getUser(final Player base) public User getUser(final Player base)
{ {

18
Essentials/src/com/earth2me/essentials/UserMap.java
View file

@ -78,24 +78,12 @@ public class UserMap extends CacheLoader<String, User> implements IConf
} }
@Override @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()) for (Player player : ess.getServer().getOnlinePlayers())
{ {
if (player.getName().equalsIgnoreCase(name)) String sanitizedPlayer = StringUtil.sanitizeFileName(player.getName());
if (sanitizedPlayer.equalsIgnoreCase(sanitizedName))
{ {
keys.add(sanitizedName); keys.add(sanitizedName);
return new User(player, ess); return new User(player, ess);