[ci skip] Updated Upstream for API patches

patches/api/0002-Pufferfish-Sentry.patch

@@ -7,14 +7,14 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f2cbc7a803177a901135cf020239031979292c6c..9a116f72816226aa35c86c1e6ddfbbf8aa4b652d 100644
+index f2cbc7a803177a901135cf020239031979292c6c..1bbc94b97662aa0367c9b5bac19bec313f158c14 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -51,6 +51,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
-+    api("io.sentry:sentry:7.3.0") // Pufferfish
++    api("io.sentry:sentry:5.4.0") // Pufferfish
  
      implementation("org.ow2.asm:asm:9.5")
      implementation("org.ow2.asm:asm-commons:9.5")

patches/api/0005-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9a116f72816226aa35c86c1e6ddfbbf8aa4b652d..beba86dde5f104342bbef419e6ad48a4533beeb5 100644
+index 1bbc94b97662aa0367c9b5bac19bec313f158c14..6e0230fc4e4d1b16e3eb45f8d71aadbb202afcfc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,11 +9,11 @@ java {
@@ -41,9 +41,12 @@ index 9a116f72816226aa35c86c1e6ddfbbf8aa4b652d..beba86dde5f104342bbef419e6ad48a4
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
-@@ -53,11 +53,12 @@ dependencies {
+@@ -51,10 +51,11 @@ dependencies {
+     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
+     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
-     api("io.sentry:sentry:7.3.0") // Pufferfish
+-    api("io.sentry:sentry:5.4.0") // Pufferfish
++    api("io.sentry:sentry:7.3.0") // Pufferfish // Leaf - Bump Dependencies
  
 -    implementation("org.ow2.asm:asm:9.5")
 -    implementation("org.ow2.asm:asm-commons:9.5")
@@ -52,11 +55,7 @@ index 9a116f72816226aa35c86c1e6ddfbbf8aa4b652d..beba86dde5f104342bbef419e6ad48a4
 +    implementation("org.ow2.asm:asm-commons:9.6")
      // Paper end
  
--    api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
+     api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
-+    api("org.apache.maven:maven-resolver-provider:3.9.6")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
- 
 @@ -66,16 +67,17 @@ dependencies {
      testCompileOnly(annotations)
  

patches/api/0006-KTP-Allow-unknown-event-thread-execution.patch

@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Bjarne Koll <lynxplay101@gmail.com>
 Date: Thu, 9 Dec 2021 01:53:30 +0100
-Subject: [PATCH] KTP: Optimize Spigot event bus
+Subject: [PATCH] KTP: Allow unknown event thread execution
 
 Original license: GPL v3
 Original project: https://github.com/lynxplay/ktp
 
-This patch contains a lot of small optimizations to the spigot event bus
+This patch allows events to actively define that they may or may not be
-to improve its speed as much as possible, allowing for a large amount of
+called on the main thread of the server. This is preferred over passing
-events to be published by the server without impacting the overall
+the "asyncness" of the event as async bool parameter to the event instance
-performance too much.
+every time.
 
 diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
 index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..caae79275802bc5e5a5385d6a11903dfa84325d1 100644
@@ -87,7 +87,7 @@ index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..8d3605f25e97a375971705c737bc7bac
              }
          }
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index f9b57b872780aa6b9b959494874b57c7a8ff0c53..a2114da1d3df87f9018ee10c024c3a4bb57c6b6e 100644
+index 7e4f7cb2afbc145e532285c793573ad107bc3033..0866bd1bfbadf58c5a4b0f1cc0a80f40ff2a2799 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -318,4 +318,12 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm

patches/api/0007-KeYi-Player-Skull-API.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f42b134854201a94601f2660cb62a8211a8f49f7..a6b2f46886a228f5e247cd34031982d260f58d91 100644
+index f42b134854201a94601f2660cb62a8211a8f49f7..9c6b5799897237ce0095087fdc9eec446420cc1f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -9,6 +9,10 @@ import java.util.Date;
@@ -31,7 +31,7 @@ index f42b134854201a94601f2660cb62a8211a8f49f7..a6b2f46886a228f5e247cd34031982d2
 +     * Get a skull item of a player.
 +     * This method runs on main thread, which may freeze the server.
 +     *
-+     * @return A ItemStack of the skull of the player
++     * @return A skull ItemStack of the player
 +     */
 +    ItemStack getSkull();
 +
@@ -39,7 +39,7 @@ index f42b134854201a94601f2660cb62a8211a8f49f7..a6b2f46886a228f5e247cd34031982d2
 +     * Get a skull item of a player.
 +     * This method runs on main thread, which may freeze the server.
 +     *
-+     * @return A CompletableFuture the of ItemStack of the skull of the player
++     * @return A CompletableFuture of the skull ItemStack of the player
 +     */
 +    CompletableFuture<ItemStack> getSkullAsynchronously();
 +    // KeYi end

patches/api/0008-Slice-Smooth-Teleports.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a6b2f46886a228f5e247cd34031982d260f58d91..03ef67f5024c69c3b92518989e1c939386ce65ac 100644
+index 9c6b5799897237ce0095087fdc9eec446420cc1f..83f5565efe1d592a6d1b65000034ae8d695aea34 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3564,6 +3564,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -24,7 +24,7 @@ index a6b2f46886a228f5e247cd34031982d260f58d91..03ef67f5024c69c3b92518989e1c9393
 +     */
 +    // Slice start
 +    @org.jetbrains.annotations.ApiStatus.Experimental
-+    void teleportWithoutRespawn(Location location);
++    void teleportWithoutRespawn(@NotNull Location location);
 +    // Slice end
 +
      // Paper start - Teleport API

patches/generated-api/0001-Purpur-generated-api-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 3d52f066c1bf1fc61d86164993fd7cac94ca5dce
+Commit: 770fbe66e095ee36ca4a5c0d3ea8b26a0eb5efab
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 069f2668f5229b0368b796e65eef1648fba0a097..9b991201a2f6cc9feccccf7f4e7bcded64117764 100644