TotalFreedomMC/OpenInv
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/OpenInv.git synced 2024-12-23 00:15:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29 from ShadowRanger/master

Browse source 
Fix & improve UUID retrieval
This commit is contained in:
Lishid 2015-07-10 15:55:17 -07:00
commit 4f40459b96
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/com/lishid/openinv/utils/UUIDUtil.java
View file

@ -34,35 +34,36 @@ public class UUIDUtil {
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
private static UUID getUUIDLocally(String name) {
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(name);
return offlinePlayer.hasPlayedBefore() ? offlinePlayer.getUniqueId() : null;
}
public static UUID getUUIDOf(String name) { public static UUID getUUIDOf(String name) {
UUID uuid = null; UUID uuid;
Player player = getPlayer(name); Player player = getPlayer(name);
if (player != null) { if (player != null) {
// Player was found online
uuid = player.getUniqueId(); uuid = player.getUniqueId();
} }
else { else {
// Player was not found online. Fetch their UUID instead if (Bukkit.getServer().getOnlineMode()) {
UUIDFetcher fetcher = new UUIDFetcher(Arrays.asList(name)); if (!Bukkit.getServer().isPrimaryThread()) {
Map<String, UUID> response; UUIDFetcher fetcher = new UUIDFetcher(Arrays.asList(name));
Map<String, UUID> response;
try { try {
response = fetcher.call(); response = fetcher.call();
uuid = response.get(name.toLowerCase()); uuid = response.get(name.toLowerCase());
} }
catch (Exception e) { catch (Exception e) {
/* uuid = getUUIDLocally(name);
Bukkit.getServer().getLogger().warning("Exception while running UUIDFetcher"); }
e.printStackTrace(); } else {
*/ uuid = getUUIDLocally(name);
// Failed to retrieve with UUIDFetcher, server might be offline?
// Fallback on searching for the player via their name
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(name);
if (offlinePlayer != null) {
uuid = offlinePlayer.getUniqueId();
} }
} else {
uuid = getUUIDLocally(name);
} }
} }