TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-10-02 14:53:47 +00:00
Code Issues Projects Releases Wiki Activity

Allow usermap to support legacy users, and restore ability to create user on first access, as well as server join.

Browse source
This commit is contained in:
KHobbits 2014-04-15 00:07:35 +01:00
parent e8ace54036
commit 3dbf69f163
1 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,16 +127,33 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
public User getUser(final String name)
{
try
{
{
final String sanitizedName = StringUtil.sanitizeFileName(name);
if (names.containsKey(sanitizedName))
{
ess.getLogger().info("Trying to grab user via string, found matching key.");
final UUID uuid = names.get(sanitizedName);
return users.get(uuid);
}
ess.getLogger().info("Trying to grab user via string, failed, returning null.");
return null; // TODO: THIS IS PROBABLY NOT RIGHT
for (Player player : ess.getServer().getOnlinePlayers())
{
String sanitizedPlayer = StringUtil.sanitizeFileName(player.getName());
if (sanitizedPlayer.equalsIgnoreCase(sanitizedName))
{
User user = new User(player, ess);
trackUUID(user.getBase().getUniqueId(), user.getName());
return new User(player, ess);
}
}
final File userFile = getUserFileFromString(sanitizedName);
if (userFile.exists())
{
User user = new User(new OfflinePlayer(sanitizedName, ess.getServer()), ess);
trackUUID(user.getBase().getUniqueId(), user.getName());
return user;
}
return null;
}
catch (ExecutionException ex)
{
@ -166,8 +183,12 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
public void trackUUID(final UUID uuid, final String name)
{
names.put(StringUtil.sanitizeFileName(name), uuid);
writeUUIDMap();
if (uuid != null)
{
names.put(StringUtil.sanitizeFileName(name), uuid);
keys.add(uuid);
writeUUIDMap();
}
}
public void writeUUIDMap()
@ -221,8 +242,11 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
public void removeUser(final String name)
{
UUID uuid = names.get(name);
keys.remove(uuid);
users.invalidate(uuid);
if (uuid != null)
{
keys.remove(uuid);
users.invalidate(uuid);
}
names.remove(name);
names.remove(StringUtil.sanitizeFileName(name));
}
@ -242,4 +266,10 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
final File userFolder = new File(ess.getDataFolder(), "userdata");
return new File(userFolder, uuid.toString() + ".yml");
}
public File getUserFileFromString(final String name)
{
final File userFolder = new File(ess.getDataFolder(), "userdata");
return new File(userFolder, StringUtil.sanitizeFileName(name) + ".yml");
}
}