reorder patches after merge

patches/api/0232-Add-getOfflinePlayerIfCached-String.patch

@@ -0,0 +1,68 @@
+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 af0cf1fe3db1efd39bc06a89216413fc4415b007..bad4593447ca390b3e2f3bc71b4ea9f4dd673445 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -962,6 +962,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 64316a3bcba881f9366d9bf9e16b205e2b817707..48c6434a6a5b1659d4cc8ddf8fe23806628c3b7e 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -808,6 +808,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.