Attempt to fix OfflinePlayer bug

This commit is contained in:
AppleDash 2016-09-30 20:25:11 -04:00
parent 8447f245d5
commit c7065ea9fa

View File

@ -19,7 +19,7 @@ public class PlayerUtils {
public static OfflinePlayer getOfflinePlayer(String playerNameOrUUID) { public static OfflinePlayer getOfflinePlayer(String playerNameOrUUID) {
OfflinePlayer player = tryGetFromUUID(playerNameOrUUID); OfflinePlayer player = tryGetFromUUID(playerNameOrUUID);
if (player != null) { if (player != null && player.hasPlayedBefore()) {
return player; return player;
} }
@ -38,6 +38,7 @@ public class PlayerUtils {
private static OfflinePlayer tryGetFromUUID(String possibleUUID) { private static OfflinePlayer tryGetFromUUID(String possibleUUID) {
UUID uuid; UUID uuid;
OfflinePlayer player;
try { try {
uuid = UUID.fromString(possibleUUID); uuid = UUID.fromString(possibleUUID);
@ -45,6 +46,12 @@ public class PlayerUtils {
return null; return null;
} }
player = Bukkit.getServer().getPlayer(uuid);
if (player != null) {
return player;
}
return Bukkit.getServer().getOfflinePlayer(uuid); return Bukkit.getServer().getOfflinePlayer(uuid);
} }
} }