2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: oxygencraft <21054297+oxygencraft@users.noreply.github.com>
|
|
|
|
Date: Sun, 25 Oct 2020 18:34:50 +1100
|
|
|
|
Subject: [PATCH] Add getOfflinePlayerIfCached(String)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2021-06-14 16:58:00 +00:00
|
|
|
index 7795735e5acc3b7b6b71b4e61bdc4bdcb722a7b3..ecae20bb39848cc0223df3c4804a68f4e0731e3b 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2021-06-14 16:58:00 +00:00
|
|
|
@@ -1613,6 +1613,28 @@ public final class CraftServer implements Server {
|
2021-06-11 12:02:28 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ @Nullable
|
|
|
|
+ public OfflinePlayer getOfflinePlayerIfCached(String name) {
|
|
|
|
+ Validate.notNull(name, "Name cannot be null");
|
|
|
|
+ Validate.notEmpty(name, "Name cannot be empty");
|
|
|
|
+
|
|
|
|
+ OfflinePlayer result = getPlayerExact(name);
|
|
|
|
+ if (result == null) {
|
|
|
|
+ GameProfile profile = console.getProfileCache().getProfileIfCached(name);
|
|
|
|
+
|
|
|
|
+ if (profile != null) {
|
|
|
|
+ result = getOfflinePlayer(profile);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ offlinePlayers.remove(result.getUniqueId());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public OfflinePlayer getOfflinePlayer(UUID id) {
|
|
|
|
Validate.notNull(id, "UUID cannot be null");
|