Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
e6f8284125
Upstream has released updates that appear 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: d43a1e72 SPIGOT-2450: Improve scoreboard criteria API, add missing DisplaySlots 9d6e4847 SPIGOT-7122: New Allay Methods from 1.19.1 CraftBukkit Changes: c379a6b4e SPIGOT-2450: Improve scoreboard criteria API, add missing DisplaySlots 051fcced1 SPIGOT-7122: New Allay Methods from 1.19.1
69 Zeilen
2.6 KiB
Diff
69 Zeilen
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: oxygencraft <21054297+oxygencraft@users.noreply.github.com>
|
|
Date: Sun, 25 Oct 2020 18:35:58 +1100
|
|
Subject: [PATCH] Add getOfflinePlayerIfCached(String)
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 2d26f1fd3bbbe95e7a73bb5ebc7d85c9e066c1ee..f1e1efaebfd9fe4399ff9d23c76f7dde6419ff71 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1228,6 +1228,27 @@ public final class Bukkit {
|
|
return server.getOfflinePlayer(name);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the player by the given name, regardless if they are offline or
|
|
+ * online.
|
|
+ * <p>
|
|
+ * This will not make a web request to get the UUID for the given name,
|
|
+ * thus this method will not block. However this method will return
|
|
+ * {@code null} if the player is not cached.
|
|
+ * </p>
|
|
+ *
|
|
+ * @param name the name of the player to retrieve
|
|
+ * @return an offline player if cached, {@code null} otherwise
|
|
+ * @see #getOfflinePlayer(String)
|
|
+ * @see #getOfflinePlayer(java.util.UUID)
|
|
+ */
|
|
+ @Nullable
|
|
+ public static OfflinePlayer getOfflinePlayerIfCached(@NotNull String name) {
|
|
+ return server.getOfflinePlayerIfCached(name);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the player by the given UUID, regardless if they are offline or
|
|
* online.
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 634a7e38987bc18232c07e5f767b37b523f13920..50542df291d90a667af119fb9fcc3db2535ae6b5 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1023,6 +1023,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
@NotNull
|
|
public OfflinePlayer getOfflinePlayer(@NotNull String name);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the player by the given name, regardless if they are offline or
|
|
+ * online.
|
|
+ * <p>
|
|
+ * This will not make a web request to get the UUID for the given name,
|
|
+ * thus this method will not block. However this method will return
|
|
+ * {@code null} if the player is not cached.
|
|
+ * </p>
|
|
+ *
|
|
+ * @param name the name of the player to retrieve
|
|
+ * @return an offline player if cached, {@code null} otherwise
|
|
+ * @see #getOfflinePlayer(String)
|
|
+ * @see #getOfflinePlayer(java.util.UUID)
|
|
+ */
|
|
+ @Nullable
|
|
+ public OfflinePlayer getOfflinePlayerIfCached(@NotNull String name);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the player by the given UUID, regardless if they are offline or
|
|
* online.
|