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

Fall back to CraftBukkit userCache or Mojang for UUID lookups

Browse source
This commit is contained in:
vemacs 2015-11-29 16:22:51 -07:00
parent 0eb5063332
commit 72e99a8833
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,13 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import com.earth2me.essentials.utils.StringUtil; import com.earth2me.essentials.utils.StringUtil;
import com.google.common.base.Charsets;
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.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.util.concurrent.UncheckedExecutionException; import com.google.common.util.concurrent.UncheckedExecutionException;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.io.File; import java.io.File;
@ -66,10 +68,20 @@ public class UserMap extends CacheLoader<String, User> implements IConf {
public User getUser(final String name) { public User getUser(final String name) {
try { try {
User offlineUser = null;
final String sanitizedName = StringUtil.safeString(name); final String sanitizedName = StringUtil.safeString(name);
if (names.containsKey(sanitizedName)) { if (names.containsKey(sanitizedName)) {
final UUID uuid = names.get(sanitizedName); final UUID uuid = names.get(sanitizedName);
return getUser(uuid); offlineUser = getUser(uuid);
} else {
UUID bukkitUuid = getIdFromBukkit(sanitizedName);
if (bukkitUuid != null) {
names.put(sanitizedName, bukkitUuid);
offlineUser = getUser(bukkitUuid);
}
}
if (offlineUser != null) {
return offlineUser;
} }
final File userFile = getUserFileFromString(sanitizedName); final File userFile = getUserFileFromString(sanitizedName);
@ -210,4 +222,15 @@ public class UserMap extends CacheLoader<String, User> implements IConf {
// } // }
// } // }
// } // }
@SuppressWarnings("deprecation")
private UUID getIdFromBukkit(String name) {
ess.getLogger().warning("Using potentially blocking Bukkit UUID lookup for: " + name);
UUID uuid = Bukkit.getOfflinePlayer(name).getUniqueId();
if (uuid.equals(UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8)))) {
return null;
} else {
return uuid;
}
}
} }