2021-06-11 14:02:28 +02: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
|
2022-06-10 16:15:38 +02:00
|
|
|
index e824869ede5b6bd531609c2f4e5cb7edfafb4904..41eaca0ef3d5d309fab7e7dddff0310d24c88966 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-06-09 10:51:45 +02:00
|
|
|
@@ -1782,6 +1782,28 @@ public final class CraftServer implements Server {
|
2021-06-11 14:02:28 +02: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");
|