From d4e108db0db37b28b9986dc61e4493028ee1f9e6 Mon Sep 17 00:00:00 2001
From: Black Hole <black-hole@live.com>
Date: Sun, 15 Dec 2019 19:28:44 +0100
Subject: [PATCH] Don't show 1.15 plugins as legacy in plugins command (#2755)

* Don't show 1.15 plugins as legacy in plugins command

* Use CraftMagicNumbers.SUPPORTED_API
---
 ...dd-an-asterisk-to-legacy-API-plugins.patch | 12 ++++++----
 ...ftMagicNumbers.isSupportedApiVersion.patch | 23 +++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch

diff --git a/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
index 9f4a726353..294d3161c0 100644
--- a/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
@@ -1,13 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Thu, 19 Jul 2018 15:07:02 -0500
+Date: Thu, 19 Jul 2018 22:07:02 +0200
 Subject: [PATCH] Add an asterisk to legacy API plugins
 
 Not here to name and shame, only so server admins can be aware of which
 plugins have and haven't been updated.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index c0ff133de..b173e2ece 100644
+index c0ff133d..82106426 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -0,0 +0,0 @@ public interface UnsafeValues {
@@ -15,13 +15,15 @@ index c0ff133de..b173e2ece 100644
          return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
      }
 +
++    boolean isSupportedApiVersion(String apiVersion);
++
 +    static boolean isLegacyPlugin(org.bukkit.plugin.Plugin plugin) {
-+        return !"1.13".equals(plugin.getDescription().getAPIVersion()) && !"1.14".equals(plugin.getDescription().getAPIVersion());
++        return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
 +    }
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index d4e74d292..6cfd9f3c6 100644
+index d4e74d29..6cfd9f3c 100644
 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 @@ -0,0 +0,0 @@ public class PluginsCommand extends BukkitCommand {
@@ -41,7 +43,7 @@ index d4e74d292..6cfd9f3c6 100644
  
          StringBuilder pluginList = new StringBuilder();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index bc7bf6a35..31a70b294 100644
+index bc7bf6a3..31a70b29 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch
new file mode 100644
index 0000000000..ede2a9ab55
--- /dev/null
+++ b/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BlackHole <black-hole@live.com>
+Date: Sun, 15 Dec 2019 19:12:39 +0100
+Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+index 21bfdf9e7..ab5c6e92e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
+         return new com.destroystokyo.paper.PaperVersionFetcher();
+     }
++
++    @Override
++    public boolean isSupportedApiVersion(String apiVersion) {
++        return apiVersion != null && SUPPORTED_API.contains(apiVersion);
++    }
+     // Paper end
+ 
+     /**
+--
\ No newline at end of file