mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From aeee26dcf880c0670381073a9ff2baf808ed7739 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 22 Mar 2018 01:39:28 -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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 161a714e5..0c519c412 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -423,6 +423,20 @@ public final class Bukkit {
|
|
return server.getPlayer(id);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the unique ID of the player currently known as the specified player name
|
|
+ * In Offline Mode, will return an Offline UUID
|
|
+ *
|
|
+ * @param playerName the player name to look up the unique ID for
|
|
+ * @return A UUID, or null if that player name is not registered with Minecraft and the server is in online mode
|
|
+ */
|
|
+ @Nullable
|
|
+ public static UUID getPlayerUniqueId(@NotNull String playerName) {
|
|
+ return server.getPlayerUniqueId(playerName);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the plugin manager for interfacing with plugins.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 463724e40..8a76df524 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient {
|
|
@Nullable
|
|
public Player getPlayer(@NotNull UUID id);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the unique ID of the player currently known as the specified player name
|
|
+ * In Offline Mode, will return an Offline UUID
|
|
+ *
|
|
+ * @param playerName the player name to look up the unique ID for
|
|
+ * @return A UUID, or null if that player name is not registered with Minecraft and the server is in online mode
|
|
+ */
|
|
+ @Nullable
|
|
+ public UUID getPlayerUniqueId(@NotNull String playerName);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the plugin manager for interfacing with plugins.
|
|
*
|
|
--
|
|
2.21.0
|
|
|