2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-03-22 05:41:44 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Thu, 22 Mar 2018 01:40:24 -0400
|
|
|
|
Subject: [PATCH] getPlayerUniqueId API
|
|
|
|
|
|
|
|
Gets the unique ID of the player currently known as the specified player name
|
|
|
|
In Offline Mode, will return an Offline UUID
|
|
|
|
|
|
|
|
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2020-07-02 01:27:09 +00:00
|
|
|
index bfe812fdb3aca643634281a57c4f94509dbe70b1..79c4ed5aa074b00d7026311f22d5a9e44666ed62 100644
|
2018-03-22 05:41:44 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2020-07-02 01:27:09 +00:00
|
|
|
@@ -1485,6 +1485,26 @@ public final class CraftServer implements Server {
|
2018-03-22 05:41:44 +00:00
|
|
|
return recipients.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Nullable
|
|
|
|
+ public UUID getPlayerUniqueId(String name) {
|
|
|
|
+ Player player = Bukkit.getPlayerExact(name);
|
|
|
|
+ if (player != null) {
|
|
|
|
+ return player.getUniqueId();
|
|
|
|
+ }
|
|
|
|
+ GameProfile profile;
|
|
|
|
+ // Only fetch an online UUID in online mode
|
2019-05-06 03:53:47 +00:00
|
|
|
+ if (net.minecraft.server.MinecraftServer.getServer().getOnlineMode()
|
2018-03-22 05:41:44 +00:00
|
|
|
+ || (org.spigotmc.SpigotConfig.bungee && com.destroystokyo.paper.PaperConfig.bungeeOnlineMode)) {
|
|
|
|
+ profile = console.getUserCache().getProfile( name );
|
|
|
|
+ } else {
|
|
|
|
+ // Make an OfflinePlayer using an offline mode UUID since the name has no profile
|
|
|
|
+ profile = new GameProfile(UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8)), name);
|
|
|
|
+ }
|
|
|
|
+ return profile != null ? profile.getId() : null;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
@Deprecated
|
|
|
|
public OfflinePlayer getOfflinePlayer(String name) {
|