Start working on 1.19.4
This commit is contained in:
		
					parent
					
						
							
								155aa36d89
							
						
					
				
			
			
				commit
				
					
						2ed604cf72
					
				
			
		
					 1390 changed files with 238 additions and 262 deletions
				
			
		| 
						 | 
				
			
			@ -1,68 +0,0 @@
 | 
			
		|||
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 6d98664f2da191c2327e80b8212c1ad979f7d6ac..ceb8d207843df5ddc852d44928286648a652eedb 100644
 | 
			
		||||
--- a/src/main/java/org/bukkit/Bukkit.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/Bukkit.java
 | 
			
		||||
@@ -1230,6 +1230,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 936ebaf531a76cab12809cfa334e2b0d89e625c3..02b898d441c42771903d5839c3cde544b1a25778 100644
 | 
			
		||||
--- a/src/main/java/org/bukkit/Server.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/Server.java
 | 
			
		||||
@@ -1025,6 +1025,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.
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue