TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix double names in /balancetop and show display name in balancetop

Browse source
This commit is contained in:
snowleo 2011-12-19 12:39:23 +01:00
parent 5a092f0e99
commit 5bb7d82fca
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public class UserMap extends CacheLoader<String, User> implements IConf
continue; continue;
} }
final String name = string.substring(0, string.length() - 4); final String name = string.substring(0, string.length() - 4);
keys.add(name.toLowerCase(Locale.ENGLISH)); keys.add(Util.sanitizeFileName(name));
} }
} }
}); });
@ -55,14 +55,14 @@ public class UserMap extends CacheLoader<String, User> implements IConf
public boolean userExists(final String name) public boolean userExists(final String name)
{ {
return keys.contains(name.toLowerCase(Locale.ENGLISH)); return keys.contains(Util.sanitizeFileName(name));
} }
public User getUser(final String name) public User getUser(final String name)
{ {
try try
{ {
return users.get(name.toLowerCase(Locale.ENGLISH)); return users.get(Util.sanitizeFileName(name));
} }
catch (ExecutionException ex) catch (ExecutionException ex)
{ {
@ -81,14 +81,14 @@ public class UserMap extends CacheLoader<String, User> implements IConf
{ {
if (player.getName().equalsIgnoreCase(name)) if (player.getName().equalsIgnoreCase(name))
{ {
keys.add(name.toLowerCase(Locale.ENGLISH)); keys.add(Util.sanitizeFileName(name));
return new User(player, ess); return new User(player, ess);
} }
} }
final File userFile = getUserFile(name); final File userFile = getUserFile(name);
if (userFile.exists()) if (userFile.exists())
{ {
keys.add(name.toLowerCase(Locale.ENGLISH)); keys.add(Util.sanitizeFileName(name));
return new User(new OfflinePlayer(name, ess), ess); return new User(new OfflinePlayer(name, ess), ess);
} }
throw new Exception("User not found!"); throw new Exception("User not found!");
@ -102,8 +102,8 @@ public class UserMap extends CacheLoader<String, User> implements IConf
public void removeUser(final String name) public void removeUser(final String name)
{ {
keys.remove(name.toLowerCase(Locale.ENGLISH)); keys.remove(Util.sanitizeFileName(name));
users.invalidate(name.toLowerCase(Locale.ENGLISH)); users.invalidate(Util.sanitizeFileName(name));
} }
public Set<String> getAllUniqueUsers() public Set<String> getAllUniqueUsers()

2
Essentials/src/com/earth2me/essentials/commands/Commandbalancetop.java
View file

@ -112,7 +112,7 @@ public class Commandbalancetop extends EssentialsCommand
final User user = ess.getUserMap().getUser(u); final User user = ess.getUserMap().getUser(u);
if (user != null) if (user != null)
{ {
balances.put(u, user.getMoney()); balances.put(user.getDisplayName(), user.getMoney());
} }
} }