minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Fix & improve UUID retrieval #29

Merged
ShadowRanger merged 1 commits from master into master 2015-07-10 18:55:17 -04:00
Conversation 3 Commits 1 Files Changed 1 +21 -20
1 changed files with 21 additions and 20 deletions
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);
} }
} }