From 33f101b760743f0e666a3db975e4affa0b8c47fb Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Tue, 1 Dec 2020 15:06:14 +0100
Subject: [PATCH] Fix plugin provides not being listed behind name in /plugins
 (#4825)

---
 ...dd-an-asterisk-to-legacy-API-plugins.patch | 13 ++++++++-----
 .../Make-plugins-list-alphabetical.patch      | 12 ++++--------
 ...necessary-space-for-provided-plugins.patch | 19 -------------------
 3 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 Spigot-API-Patches/Remove-unnecessary-space-for-provided-plugins.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 76618cfb06..81ae7a4d1c 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,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Thu, 19 Jul 2018 22:07:02 +0200
+From: Phoenix616 <max@themoep.de>
+Date: Tue, 1 Dec 2020 14:57:02 +0100
 Subject: [PATCH] Add an asterisk to legacy API plugins
 
 Not here to name and shame, only so server admins can be aware of which
@@ -27,8 +27,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- 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 {
+             }
  
- 
+             Plugin plugin = entry.getValue();
+-            
++
              pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
 -            pluginList.append(plugin.getDescription().getName());
 +            // Paper start - Add an asterisk to legacy plugins (so admins are aware)
@@ -38,9 +41,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            }
 +            pluginList.append(pluginName);
 +            // Paper end
-         }
  
-         return "(" + plugins.size() + "): " + pluginList.toString();
+             if (plugin.getDescription().getProvides().size() > 0) {
+                 pluginList.append(" (").append(String.join(", ", plugin.getDescription().getProvides())).append(")");
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
diff --git a/Spigot-API-Patches/Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/Make-plugins-list-alphabetical.patch
index 9c773aa032..b714733ba0 100644
--- a/Spigot-API-Patches/Make-plugins-list-alphabetical.patch
+++ b/Spigot-API-Patches/Make-plugins-list-alphabetical.patch
@@ -39,17 +39,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  pluginList.append(", ");
              }
  
--            pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
--            pluginList.append(plugin.getDescription().getName());
 +            Plugin plugin = entry.getValue();
++            
+             pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
+             pluginList.append(plugin.getDescription().getName());
  
-             if (plugin.getDescription().getProvides().size() > 0) {
-                 pluginList.append(" (").append(String.join(", ", plugin.getDescription().getProvides())).append(")");
+@@ -0,0 +0,0 @@ public class PluginsCommand extends BukkitCommand {
              }
-+
-+
-+            pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
-+            pluginList.append(plugin.getDescription().getName());
          }
  
 -        return "(" + plugins.length + "): " + pluginList.toString();
diff --git a/Spigot-API-Patches/Remove-unnecessary-space-for-provided-plugins.patch b/Spigot-API-Patches/Remove-unnecessary-space-for-provided-plugins.patch
deleted file mode 100644
index 83edd1d050..0000000000
--- a/Spigot-API-Patches/Remove-unnecessary-space-for-provided-plugins.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aurora <aurora@relanet.eu>
-Date: Sat, 3 Oct 2020 21:26:01 +0200
-Subject: [PATCH] Remove unnecessary space for provided plugins
-
-
-diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 {
-             Plugin plugin = entry.getValue();
- 
-             if (plugin.getDescription().getProvides().size() > 0) {
--                pluginList.append(" (").append(String.join(", ", plugin.getDescription().getProvides())).append(")");
-+                pluginList.append("(").append(String.join(", ", plugin.getDescription().getProvides())).append(")"); // Paper - Remove unnecessary space
-             }
- 
-