minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-10 08:34:17 +02:00
Code Issues Releases Wiki Activity

Remove online player lookup in usermap.getUUIDMap(), throw log entry on failback.

Browse Source
This commit is contained in:
KHobbits
2014-05-27 18:04:02 +01:00
parent e8b39f7e3c
commit 9a8dfb8be3
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Essentials/src/com/earth2me/essentials/UserMap.java
View File

@@ -4,6 +4,9 @@ import com.earth2me.essentials.utils.StringUtil;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.RemovalCause;
import com.google.common.cache.RemovalListener;
import com.google.common.cache.RemovalNotification;
import com.google.common.util.concurrent.UncheckedExecutionException; import com.google.common.util.concurrent.UncheckedExecutionException;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@@ -33,6 +36,8 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
super(); super();
this.ess = ess; this.ess = ess;
uuidMap = new UUIDMap(ess); uuidMap = new UUIDMap(ess);
//RemovalListener<UUID, User> remListener = new UserMapRemovalListener();
//users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().removalListener(remListener).build(this);
users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().build(this); users = CacheBuilder.newBuilder().maximumSize(ess.getSettings().getMaxUserCacheCount()).softValues().build(this);
} }
@@ -89,21 +94,11 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
final UUID uuid = names.get(sanitizedName); final UUID uuid = names.get(sanitizedName);
return users.get(uuid); return users.get(uuid);
} }
for (Player player : ess.getServer().getOnlinePlayers())
{
String sanitizedPlayer = StringUtil.safeString(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); final File userFile = getUserFileFromString(sanitizedName);
if (userFile.exists()) if (userFile.exists())
{ {
ess.getLogger().info("Importing user " + name + " to usermap.");
User user = new User(new OfflinePlayer(sanitizedName, ess.getServer()), ess); User user = new User(new OfflinePlayer(sanitizedName, ess.getServer()), ess);
trackUUID(user.getBase().getUniqueId(), user.getName()); trackUUID(user.getBase().getUniqueId(), user.getName());
return user; return user;
@@ -185,6 +180,11 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
loadAllUsersAsync(ess); loadAllUsersAsync(ess);
} }
public void invalidateAll()
{
users.invalidateAll();
}
public void removeUser(final String name) public void removeUser(final String name)
{ {
UUID uuid = names.get(name); UUID uuid = names.get(name);
@@ -238,4 +238,16 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
final File userFolder = new File(ess.getDataFolder(), "userdata"); final File userFolder = new File(ess.getDataFolder(), "userdata");
return new File(userFolder, StringUtil.sanitizeFileName(name) + ".yml"); return new File(userFolder, StringUtil.sanitizeFileName(name) + ".yml");
} }
// class UserMapRemovalListener implements RemovalListener
// {
// @Override
// public void onRemoval(final RemovalNotification notification)
// {
// Object value = notification.getValue();
// if (value != null)
// {
// ((User)value).cleanup();
// }
// }
// }
} }