Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@28167fb Updated Upstream (Paper)
PurpurMC/Purpur@ae43061 Fix clickable spark documentation link in timings command (#1148)

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Wed, 5 Oct 2022 11:55:29 +0000
+Date: Sat, 8 Oct 2022 23:50:13 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Original by Kevin Raneri <[email protected]>

patches/api/0002-Purpur-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Wed, 5 Oct 2022 11:57:15 +0000
+Date: Sat, 8 Oct 2022 23:52:16 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original by PurpurMC Team
@@ -111,7 +111,7 @@ index dd72a34eaa4bedd9ea0b92eaa79091b00eb4dd09..759e9cbcedb50894821dcb6dcc602af4
      }
 
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
-index 3132dc98d26c54c5e46162e53aaed195d7335c8d..f744ef6bb38f9fada25720862b83ce37007ce769 100644
+index 3132dc98d26c54c5e46162e53aaed195d7335c8d..b461b5c50f97f11cb9ef68abc520271bb72440fa 100644
 --- a/src/main/java/co/aikar/timings/TimingsCommand.java
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
 @@ -44,7 +44,7 @@ public class TimingsCommand extends BukkitCommand {
@@ -129,9 +129,9 @@ index 3132dc98d26c54c5e46162e53aaed195d7335c8d..f744ef6bb38f9fada25720862b83ce37
          }
 +        if (true) {
 +            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 <grey>/spark</grey> 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><click:open_url:'url'>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;
 +        }
          if (args.length < 1) {

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Wed, 5 Oct 2022 11:55:29 +0000
+Date: Sat, 8 Oct 2022 23:50:13 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Original by Kevin Raneri <[email protected]>

patches/server/0002-Purpur-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Wed, 5 Oct 2022 11:57:15 +0000
+Date: Sat, 8 Oct 2022 23:52:16 +0000
 Subject: [PATCH] Purpur Server Changes
 
 Original by PurpurMC Team
@@ -2754,7 +2754,7 @@ index af7acb628b84539b1ee5ef1934f75f091c4cd91e..12637019da44019475042e4cf88d3e0e
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0a5f8d990cce5df339fd9b2b0fcb291a20ddad41..0a884ca8b081f1952638ee83ebae957527696fbf 100644
+index 0a5f8d990cce5df339fd9b2b0fcb291a20ddad41..194e9e341b9d1a966d0d78af19120422d7b7eb0a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -389,6 +389,7 @@ public class ServerPlayerGameMode {
@@ -2791,15 +2791,6 @@ index 0a5f8d990cce5df339fd9b2b0fcb291a20ddad41..0a884ca8b081f1952638ee83ebae9575
          BlockPos blockposition = hitResult.getBlockPos();
          BlockState iblockdata = world.getBlockState(blockposition);
          InteractionResult enuminteractionresult = InteractionResult.PASS;
-@@ -520,7 +522,7 @@ public class ServerPlayerGameMode {
-         }
-
-         if (player.getCooldowns().isOnCooldown(stack.getItem())) {
--            cancelledItem = true; // Paper - correctly handle items on cooldown
-+            cancelledBlock = stack.getItem() != net.minecraft.world.item.Items.GOAT_HORN; // Purpur
-         }
-
-         PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, cancelledItem, hand, hitResult.getLocation()); // Paper
 @@ -566,7 +568,7 @@ public class ServerPlayerGameMode {
              boolean flag1 = player.isSecondaryUseActive() && flag;
              ItemStack itemstack1 = stack.copy();
@@ -3888,7 +3879,7 @@ index f5c9be3fde2654bd5a6b3ee737afe96a9393e836..64571396652d4447ce3665cd8cef668c
 
      public void setNoCounter(boolean permanent) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 568760d0824ecd7c46536479d94e3155900ce89a..46aab96ceae032aa5e8b33ec8dc2a9e88bee2d7f 100644
+index 568760d0824ecd7c46536479d94e3155900ce89a..39d71c0b35095440d5b65876cf56f406debaf04f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -156,7 +156,7 @@ import org.bukkit.plugin.PluginManager;
@@ -4005,7 +3996,7 @@ index 568760d0824ecd7c46536479d94e3155900ce89a..46aab96ceae032aa5e8b33ec8dc2a9e8
                  false, false, null, null);
 
 -            if (io.papermc.paper.util.CollisionUtil.isCollidingWithBorderEdge(world.getWorldBorder(), collisionBox)) {
-+                if (this.collidingWithWorldBorder = io.papermc.paper.util.CollisionUtil.isCollidingWithBorderEdge(world.getWorldBorder(), collisionBox)) { // Purpur
++            if (this.collidingWithWorldBorder = io.papermc.paper.util.CollisionUtil.isCollidingWithBorderEdge(world.getWorldBorder(), collisionBox)) { // Purpur
                  io.papermc.paper.util.CollisionUtil.addBoxesToIfIntersects(world.getWorldBorder().getCollisionShape(), collisionBox, potentialCollisions);
              }
 

upstream-data

@@ -1,2 +1,2 @@
-purpur = f5ae75874ac8043f7e789739196f5a7afcded4a0
+purpur = ae430619b602ce9808386e5e77d2fde038475dca
 pufferfish = 9d9a0e1a32466455cd3c3eff5b673a9e177491d6