diff --git a/gradle.properties b/gradle.properties index bed7aae91..b1acc29eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.3-R0.1-SNAPSHOT -paperCommit = bb63a6156d9f6c5d6ab018224934a3f5fbb29a89 +paperCommit = 50eacd3c0464162a41b5cff6cbeb4360aec69b7b org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0310-Improve-output-of-plugins-command.patch b/patches/server/0310-Improve-output-of-plugins-command.patch index 17f0dba60..acee37c0a 100644 --- a/patches/server/0310-Improve-output-of-plugins-command.patch +++ b/patches/server/0310-Improve-output-of-plugins-command.patch @@ -7,7 +7,7 @@ Co-authored-by: Oharass Co-authored-by: granny diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java -index 72096a66a4046633de73a12f5a043ac6dff169b1..a0200653bc7919a974e3ee6260edfb7cf4c221b4 100644 +index f0fce4113fb07c64adbec029d177c236cbdcbae8..e94224ed280247ee69dfdff8dc960f2b8729be33 100644 --- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java +++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java @@ -78,10 +78,10 @@ public class PaperPluginsCommand extends BukkitCommand { @@ -98,7 +98,7 @@ index 72096a66a4046633de73a12f5a043ac6dff169b1..a0200653bc7919a974e3ee6260edfb7c private static Component asPlainComponents(String strings) { net.kyori.adventure.text.TextComponent.Builder builder = Component.text(); -@@ -182,16 +234,16 @@ public class PaperPluginsCommand extends BukkitCommand { +@@ -182,24 +234,24 @@ public class PaperPluginsCommand extends BukkitCommand { } } @@ -107,16 +107,24 @@ index 72096a66a4046633de73a12f5a043ac6dff169b1..a0200653bc7919a974e3ee6260edfb7c //.append(INFO_ICON_START.hoverEvent(SERVER_PLUGIN_INFO)); TODO: Add docs - sender.sendMessage(infoMessage); -- sender.sendMessage(PAPER_HEADER); -- for (Component component : formatProviders(paperPlugins)) { + //sender.sendMessage(infoMessage); // Purpur -+ sender.sendMessage(PAPER_HEADER.append(Component.text(" (%s):".formatted(paperPlugins.size())))); // Purpur + + if (!paperPlugins.isEmpty()) { +- sender.sendMessage(PAPER_HEADER); ++ sender.sendMessage(PAPER_HEADER.append(Component.text(" (%s):".formatted(paperPlugins.size())))); // Purpur + } + +- for (Component component : formatProviders(paperPlugins)) { + for (Component component : formatProviders(paperPlugins, sender)) { // Purpur sender.sendMessage(component); } -- sender.sendMessage(BUKKIT_HEADER); + + if (!spigotPlugins.isEmpty()) { +- sender.sendMessage(BUKKIT_HEADER); ++ sender.sendMessage(BUKKIT_HEADER.append(Component.text(" (%s):".formatted(spigotPlugins.size())))); // Purpur + } + - for (Component component : formatProviders(spigotPlugins)) { -+ sender.sendMessage(BUKKIT_HEADER.append(Component.text(" (%s):".formatted(spigotPlugins.size())))); // Purpur + for (Component component : formatProviders(spigotPlugins, sender)) { // Purpur sender.sendMessage(component); }