diff --git a/.upstream-data b/.upstream-data index f6d8fad..a400109 100644 --- a/.upstream-data +++ b/.upstream-data @@ -1,2 +1,2 @@ -purpurCommit = f5a789d40bc8b55efaf69143067e76a9305354c5 -pufferfishCommit = d032415ca6fd0736d7cb0da28e3134b957fb83a0 +purpurCommit = 1924a57cc7a547de392686dc18fd0b1e137e95b1 +pufferfishCommit = 751dfb0338e2c09519313ffaca04084dc3140b80 diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch index aee9e11..6168f6c 100644 --- a/patches/api/0001-Pufferfish-API-Changes.patch +++ b/patches/api/0001-Pufferfish-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Tue, 28 Mar 2023 04:48:52 +0000 +Date: Thu, 30 Mar 2023 06:56:29 +0000 Subject: [PATCH] Pufferfish API Changes Original: Kevin Raneri diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch index 123f058..45446e0 100644 --- a/patches/api/0002-Purpur-API-Changes.patch +++ b/patches/api/0002-Purpur-API-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Tue, 28 Mar 2023 04:50:27 +0000 +Date: Thu, 30 Mar 2023 06:58:47 +0000 Subject: [PATCH] Purpur API Changes 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 -index e801e79fa57c44b2e5d359647c920f88064826f1..339b07715b033dacb9a4c1acd1a11baa5ba730f1 100644 +index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9ea9d254c 100644 --- a/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 { @@ -129,21 +129,22 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..339b07715b033dacb9a4c1acd1a11baa this.setPermission("bukkit.command.timings"); } -@@ -57,6 +57,13 @@ public class TimingsCommand extends BukkitCommand { - if (false) { - sender.sendMessage(Timings.deprecationMessage()); +@@ -54,8 +54,12 @@ public class TimingsCommand extends BukkitCommand { + if (!testPermission(sender)) { + 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(); + sender.sendMessage(mm.deserialize("Purpur has removed timings to save your performance. Please use /spark instead")); + sender.sendMessage(mm.deserialize("For more information, view its documentation at")); + sender.sendMessage(mm.deserialize("https://spark.lucko.me/docs/Command-Usage")); + return true; -+ } // Purpur end + } if (args.length < 1) { sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED)); - return true; -@@ -115,7 +122,7 @@ public class TimingsCommand extends BukkitCommand { +@@ -115,7 +119,7 @@ public class TimingsCommand extends BukkitCommand { Preconditions.checkNotNull(args, "Arguments cannot be null"); Preconditions.checkNotNull(alias, "Alias cannot be null"); diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index bb9c886..a23664e 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Tue, 28 Mar 2023 04:48:52 +0000 +Date: Thu, 30 Mar 2023 06:56:29 +0000 Subject: [PATCH] Pufferfish Server Changes Original: Kevin Raneri diff --git a/patches/server/0002-Purpur-Server-Changes.patch b/patches/server/0002-Purpur-Server-Changes.patch index 01c94f1..434dc97 100644 --- a/patches/server/0002-Purpur-Server-Changes.patch +++ b/patches/server/0002-Purpur-Server-Changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 -Date: Tue, 28 Mar 2023 04:50:27 +0000 +Date: Thu, 30 Mar 2023 06:58:47 +0000 Subject: [PATCH] Purpur Server Changes Original: PurpurMC