1cfd363d32
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: fc460d1b PR-735: Add Villager#zombify c8c8331e PR-690: Add method to read ItemStack input 62845f2f SPIGOT-6829: Add per-player world border API CraftBukkit Changes: a459f4d4 PR-1033: Add Villager#zombify d65d1430 PR-975: Add method to read ItemStack input b5559f8c SPIGOT-6990: Fix setRepairCost(0) in Anvil 6c308e1b SPIGOT-6829: Add per-player world border API Spigot Changes: 42b61526 SPIGOT-7000: Generation and /locate issues when using custom structure seeds
40 Zeilen
1.4 KiB
Diff
40 Zeilen
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 f4eb6a4c4d79b074f9d96f5cb84fc99ff60556a6..67579748521194f49d371be6dacc2005d7f752ed 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1800,6 +1800,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.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");
|