Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@60b83fe Validate providers when populating load order tree (#8890)
PaperMC/Paper@a9ab684 Fix update folder logging error when no folder exists (#8891)
PaperMC/Paper@87bb3e6 Close library classloader and improve PluginDescriptionFile (#8901)
PaperMC/Paper@0620289 Do not send plugin headers when it is not required (#8889)
PaperMC/Paper@ce2b6b2 Properly log any Throwable on plugin class creation (#8897)
PaperMC/Paper@6b77643 Fix chat messages logged in console (#8872)
PaperMC/Paper@50eacd3 Avoid duplicate game event on initial fill (#8887)
This commit is contained in:
granny
2023-02-23 03:39:52 -08:00
parent 9698422af2
commit 71669e3f19
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

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

22
patches/server/0310-Improve-output-of-plugins-command.patch
View File

@@ -7,7 +7,7 @@ Co-authored-by: Oharass <oharass@bk.ru>
Co-authored-by: granny <granny@purpurmc.org>
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);
}