OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix plugin provides not being listed behind name in /plugins (#4825)

Browse source
This commit is contained in:
Max Lee 2020-12-01 15:06:14 +01:00
parent 2e2d31ae89
commit 33f101b760
3 changed files with 12 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
View file

@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com> From: Phoenix616 <max@themoep.de>
Date: Thu, 19 Jul 2018 22:07:02 +0200 Date: Tue, 1 Dec 2020 14:57:02 +0100
Subject: [PATCH] Add an asterisk to legacy API plugins Subject: [PATCH] Add an asterisk to legacy API plugins
Not here to name and shame, only so server admins can be aware of which 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 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/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 { @@ -0,0 +0,0 @@ public class PluginsCommand extends BukkitCommand {
}
Plugin plugin = entry.getValue();
-
+
pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED); pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
- pluginList.append(plugin.getDescription().getName()); - pluginList.append(plugin.getDescription().getName());
+ // Paper start - Add an asterisk to legacy plugins (so admins are aware) + // Paper start - Add an asterisk to legacy plugins (so admins are aware)
@ -38,9 +41,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ pluginList.append(pluginName); + pluginList.append(pluginName);
+ // Paper end + // 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 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 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java

12
Spigot-API-Patches/Make-plugins-list-alphabetical.patch
View file

@ -39,17 +39,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
pluginList.append(", "); pluginList.append(", ");
} }
- pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
- pluginList.append(plugin.getDescription().getName());
+ Plugin plugin = entry.getValue(); + Plugin plugin = entry.getValue();
+
pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
pluginList.append(plugin.getDescription().getName());
if (plugin.getDescription().getProvides().size() > 0) { @@ -0,0 +0,0 @@ public class PluginsCommand extends BukkitCommand {
pluginList.append(" (").append(String.join(", ", plugin.getDescription().getProvides())).append(")");
} }
+
+
+ pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
+ pluginList.append(plugin.getDescription().getName());
} }
- return "(" + plugins.length + "): " + pluginList.toString(); - return "(" + plugins.length + "): " + pluginList.toString();

19
Spigot-API-Patches/Remove-unnecessary-space-for-provided-plugins.patch
View file

@ -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
}