diff --git a/patches/api/Fix-upstream-javadoc-warnings-and-errors.patch b/patches/api/Fix-upstream-javadocs.patch
similarity index 64%
rename from patches/api/Fix-upstream-javadoc-warnings-and-errors.patch
rename to patches/api/Fix-upstream-javadocs.patch
index 0a5eee681e..6e5456757a 100644
--- a/patches/api/Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/patches/api/Fix-upstream-javadocs.patch
@@ -1,10 +1,36 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
-Subject: [PATCH] Fix upstream javadoc warnings and errors
+Subject: [PATCH] Fix upstream javadocs
 
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -0,0 +0,0 @@ public final class Bukkit {
+ 
+     /**
+      * Gets every player that has ever played on this server.
++     * <p>
++     * <b>This method can be expensive as it loads all the player data files from the disk.</b>
+      *
+      * @return an array containing all previous players
+      */
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+ 
+     /**
+      * Gets every player that has ever played on this server.
++     * <p>
++     * <b>This method can be expensive as it loads all the player data files from the disk.</b>
+      *
+      * @return an array containing all previous players
+      */
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Player.java