diff --git a/patches/api/Add-FastUtil-to-Bukkit.patch b/patches/api/Add-FastUtil-to-Bukkit.patch
index 9a956b6909..58114b0f3c 100644
--- a/patches/api/Add-FastUtil-to-Bukkit.patch
+++ b/patches/api/Add-FastUtil-to-Bukkit.patch
@@ -16,4 +16,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    api("it.unimi.dsi:fastutil:8.5.6")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.4")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
diff --git a/patches/api/Add-missing-block-data-mins-and-maxes.patch b/patches/api/Add-missing-block-data-mins-and-maxes.patch
index 244a2b71d0..61f8b978f1 100644
--- a/patches/api/Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/Add-missing-block-data-mins-and-maxes.patch
@@ -44,7 +44,7 @@ diff --git a/src/main/java/org/bukkit/block/data/type/Leaves.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/block/data/type/Leaves.java
 +++ b/src/main/java/org/bukkit/block/data/type/Leaves.java
-@@ -0,0 +0,0 @@ public interface Leaves extends BlockData {
+@@ -0,0 +0,0 @@ public interface Leaves extends Waterlogged {
       * @param distance the new 'distance' value
       */
      void setDistance(int distance);
diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch
index cf64a67539..d132494f6c 100644
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    apiAndDocs("net.kyori:adventure-text-serializer-plain")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.4")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 @@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
          "https://guava.dev/releases/31.0.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch
index 3ac0364f5b..b1d7dbffd8 100644
--- a/patches/api/Build-system-changes.patch
+++ b/patches/api/Build-system-changes.patch
@@ -18,9 +18,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.4")
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 +    compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
  
 -    val annotations = "org.jetbrains:annotations-java5:23.0.0"
diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch
index 7c73f133de..af4886871b 100644
--- a/patches/api/Convert-project-to-Gradle.patch
+++ b/patches/api/Convert-project-to-Gradle.patch
@@ -48,9 +48,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    api("net.md-5:bungeecord-chat:1.16-R0.4")
 +    api("org.yaml:snakeyaml:1.30")
 +
-+    compileOnly("org.apache.maven:maven-resolver-provider:3.8.4")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
-+    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
++    compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 +
 +    val annotations = "org.jetbrains:annotations-java5:23.0.0"
 +    compileOnly(annotations)
@@ -186,13 +186,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.8.0</version>
+-            <version>1.7.3</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.8.0</version>
+-            <version>1.7.3</version>
 -            <scope>provided</scope>
 -        </dependency>
 -        <!-- annotations -->
diff --git a/patches/api/Use-ASM-for-event-executors.patch b/patches/api/Use-ASM-for-event-executors.patch
index 9d54cb44d3..2b4328839b 100644
--- a/patches/api/Use-ASM-for-event-executors.patch
+++ b/patches/api/Use-ASM-for-event-executors.patch
@@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    implementation("org.ow2.asm:asm-commons:9.2")
      // Paper end
  
-     compileOnly("org.apache.maven:maven-resolver-provider:3.8.4")
+     compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
diff --git a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index a6bff87a69..13416c78b9 100644
--- a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -25,8 +25,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper
      implementation("org.ow2.asm:asm:9.3")
 @@ -0,0 +0,0 @@ dependencies {
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
  
 +    implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
 +
diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index 5989b0037d..b1d3153d50 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -51,9 +51,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
 +    runtimeOnly("mysql:mysql-connector-java:8.0.29")
 +
-+    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.4")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
-+    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
++    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
++    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 +
 +    testImplementation("junit:junit:4.13.2")
 +    testImplementation("org.hamcrest:hamcrest-library:1.3")
@@ -431,13 +431,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-connector-basic</artifactId>
--            <version>1.8.0</version>
+-            <version>1.7.3</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.apache.maven.resolver</groupId>
 -            <artifactId>maven-resolver-transport-http</artifactId>
--            <version>1.8.0</version>
+-            <version>1.7.3</version>
 -            <scope>runtime</scope>
 -        </dependency>
 -        <!-- testing -->
diff --git a/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 89e414dd98..58f00826f5 100644
--- a/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      runtimeOnly("mysql:mysql-connector-java:8.0.29")
 +    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
  
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.4")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
+     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/resources/log4j2.xml
diff --git a/work/Bukkit b/work/Bukkit
index b93194d14a..4b08dbc5ce 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b93194d14a2bec34b8106d79094c35b10cc18466
+Subproject commit 4b08dbc5ce3ddb031df2cff7be350842670f1929
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 64c15270e7..c3f219edbe 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 64c15270e76475e68b2167d4bfba162a4a827fe0
+Subproject commit c3f219edbe18a6323b1c072d833fa2dd5ca727ec
diff --git a/work/Spigot b/work/Spigot
index 87c4d13aee..ee737122ad 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 87c4d13aee2e4a6ec924342c8b4642c87602aacc
+Subproject commit ee737122ade6975c33c206b0c753f4dd29cfafb4