40 lines
1.4 KiB
Diff
40 lines
1.4 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: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
|
||
|
|
index d8d29d14559169f5e8d8b4cf63d8b427b823eb2f..4e1b4d7cde8e0ea2d5e765dfc879db55e7bd669d 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
@@ -1584,6 +1584,28 @@ public final class CraftServer implements Server {
|
||
|
|
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.getUserCache().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");
|