Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@1924a57 Updated Upstream (Paper)
This commit is contained in:
github-actions[bot]
2023-03-30 07:08:13 +00:00
parent 424e876c7c
commit 8a333120da
5 changed files with 15 additions and 14 deletions

View File

@@ -1,2 +1,2 @@
purpurCommit = f5a789d40bc8b55efaf69143067e76a9305354c5 purpurCommit = 1924a57cc7a547de392686dc18fd0b1e137e95b1
pufferfishCommit = d032415ca6fd0736d7cb0da28e3134b957fb83a0 pufferfishCommit = 751dfb0338e2c09519313ffaca04084dc3140b80

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: AlphaKR93 <dev@alpha93.kr> From: AlphaKR93 <dev@alpha93.kr>
Date: Tue, 28 Mar 2023 04:48:52 +0000 Date: Thu, 30 Mar 2023 06:56:29 +0000
Subject: [PATCH] Pufferfish API Changes Subject: [PATCH] Pufferfish API Changes
Original: Kevin Raneri <kevin.raneri@gmail.com> Original: Kevin Raneri <kevin.raneri@gmail.com>

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: AlphaKR93 <dev@alpha93.kr> From: AlphaKR93 <dev@alpha93.kr>
Date: Tue, 28 Mar 2023 04:50:27 +0000 Date: Thu, 30 Mar 2023 06:58:47 +0000
Subject: [PATCH] Purpur API Changes Subject: [PATCH] Purpur API Changes
Original: PurpurMC Original: PurpurMC
@@ -117,7 +117,7 @@ index 9812d668ad945aba486fbf6d5bf83c4292cb5d03..187672fdcb77081653335d20537fbd79
} }
diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
index e801e79fa57c44b2e5d359647c920f88064826f1..339b07715b033dacb9a4c1acd1a11baa5ba730f1 100644 index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9ea9d254c 100644
--- a/src/main/java/co/aikar/timings/TimingsCommand.java --- a/src/main/java/co/aikar/timings/TimingsCommand.java
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
@@ -45,7 +45,7 @@ public class TimingsCommand extends BukkitCommand { @@ -45,7 +45,7 @@ public class TimingsCommand extends BukkitCommand {
@@ -129,21 +129,22 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..339b07715b033dacb9a4c1acd1a11baa
this.setPermission("bukkit.command.timings"); this.setPermission("bukkit.command.timings");
} }
@@ -57,6 +57,13 @@ public class TimingsCommand extends BukkitCommand { @@ -54,8 +54,12 @@ public class TimingsCommand extends BukkitCommand {
if (false) { if (!testPermission(sender)) {
sender.sendMessage(Timings.deprecationMessage()); return true;
} }
+ if (true) { // Purpur start - if (false) {
- sender.sendMessage(Timings.deprecationMessage());
+ if (true) {
+ net.kyori.adventure.text.minimessage.MiniMessage mm = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage(); + net.kyori.adventure.text.minimessage.MiniMessage mm = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage();
+ sender.sendMessage(mm.deserialize("<gold>Purpur has removed timings to save your performance. Please use <click:suggest_command:'/spark'><grey>/spark</grey></click> instead")); + sender.sendMessage(mm.deserialize("<gold>Purpur has removed timings to save your performance. Please use <click:suggest_command:'/spark'><grey>/spark</grey></click> instead"));
+ sender.sendMessage(mm.deserialize("<gold>For more information, view its documentation at")); + sender.sendMessage(mm.deserialize("<gold>For more information, view its documentation at"));
+ sender.sendMessage(mm.deserialize("<gold><click:open_url:'https://spark.lucko.me/docs/Command-Usage'>https://spark.lucko.me/docs/Command-Usage</click>")); + sender.sendMessage(mm.deserialize("<gold><click:open_url:'https://spark.lucko.me/docs/Command-Usage'>https://spark.lucko.me/docs/Command-Usage</click>"));
+ return true; + return true;
+ } // Purpur end }
if (args.length < 1) { if (args.length < 1) {
sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED)); sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
return true; @@ -115,7 +119,7 @@ public class TimingsCommand extends BukkitCommand {
@@ -115,7 +122,7 @@ public class TimingsCommand extends BukkitCommand {
Preconditions.checkNotNull(args, "Arguments cannot be null"); Preconditions.checkNotNull(args, "Arguments cannot be null");
Preconditions.checkNotNull(alias, "Alias cannot be null"); Preconditions.checkNotNull(alias, "Alias cannot be null");

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: AlphaKR93 <dev@alpha93.kr> From: AlphaKR93 <dev@alpha93.kr>
Date: Tue, 28 Mar 2023 04:48:52 +0000 Date: Thu, 30 Mar 2023 06:56:29 +0000
Subject: [PATCH] Pufferfish Server Changes Subject: [PATCH] Pufferfish Server Changes
Original: Kevin Raneri <kevin.raneri@gmail.com> Original: Kevin Raneri <kevin.raneri@gmail.com>

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: AlphaKR93 <dev@alpha93.kr> From: AlphaKR93 <dev@alpha93.kr>
Date: Tue, 28 Mar 2023 04:50:27 +0000 Date: Thu, 30 Mar 2023 06:58:47 +0000
Subject: [PATCH] Purpur Server Changes Subject: [PATCH] Purpur Server Changes
Original: PurpurMC Original: PurpurMC