mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-04 18:55:07 +02:00
4e958e229f
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: zml <zml@stellardrift.ca> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
69 lines
2.6 KiB
Diff
69 lines
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 6228d7eca85fba52296c8d63d32804f32af1b421..68101a322ffab8ec28843386b79b8079576fa720 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -950,6 +950,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 6237578b373002c009efde4fb4c1864f0bf4f19e..a79fa08b9e6fb924b2da933eb6e4b365d14d938d 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -797,6 +797,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.
|