Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-06-30 16:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Fixes UUID lookup

Browse Source 
https://github.com/BentoBoxWorld/bentobox/issues/232
This commit is contained in:
tastybento 2018-08-12 02:47:38 +09:00
parent efb8cb27a9
commit 7e7001e99b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/world/bentobox/bentobox/managers/PlayersManager.java
View File

@ -247,7 +247,6 @@ public class PlayersManager {
* @param name - name of player * @param name - name of player
* @return UUID of player or null if unknown * @return UUID of player or null if unknown
*/ */
@SuppressWarnings("deprecation")
public UUID getUUID(String name) { public UUID getUUID(String name) {
// See if this is a UUID // See if this is a UUID
// example: 5988eecd-1dcd-4080-a843-785b62419abb // example: 5988eecd-1dcd-4080-a843-785b62419abb
@ -256,13 +255,11 @@ public class PlayersManager {
return UUID.fromString(name); return UUID.fromString(name);
} catch (Exception ignored) {} } catch (Exception ignored) {}
} }
// Look in the name cache, then the data base and finally Bukkit blocking request // Look in the name cache, then the data base and then give up
return playerCache.values().stream() return playerCache.values().stream()
.filter(p -> p.getPlayerName().equalsIgnoreCase(name)).findFirst() .filter(p -> p.getPlayerName().equalsIgnoreCase(name)).findFirst()
.map(p -> UUID.fromString(p.getUniqueId())) .map(p -> UUID.fromString(p.getUniqueId()))
.orElse(names.objectExists(name) .orElse(names.objectExists(name) ? names.loadObject(name).getUuid() : null);
? names.loadObject(name).getUuid()
: Bukkit.getOfflinePlayer(name).getUniqueId());
} }
/** /**