diff --git a/build.gradle.kts b/build.gradle.kts
index 1f611ccb6..359f8d0dc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
 
     // In general, keep this version in sync with upstream. Sometimes a newer version than upstream might work, but an older version is extremely likely to break.
-    id("io.papermc.paperweight.patcher") version "1.5.7"
+    id("io.papermc.paperweight.patcher") version "1.5.9"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
diff --git a/gradle.properties b/gradle.properties
index 931dcc51b..5a3491eff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=com.example.paperfork
 version=1.20.2-R0.1-SNAPSHOT
 
 mcVersion=1.20.2
-paperRef=29a02095754a8bc76f996f53e1da1cc04b5fd167
+paperRef=ce7f0680956bb1c779ac4db9fe0fd1f00bb35bae
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 7cbce8c5e..3b6385969 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c187641f0ec6444a10e0e1583e1697d07e8f0267..361f8409415a160a1f7030193f9aca95c067728c 100644
+index 79beac737c17412913983614bd478d33e3c6ed58..1c6665f7d5ce445e8a7daecc3a39ad4b1342847e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -23,7 +23,7 @@ index c187641f0ec6444a10e0e1583e1697d07e8f0267..361f8409415a160a1f7030193f9aca95
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -72,7 +76,7 @@ tasks.jar {
+@@ -70,7 +74,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -32,7 +32,7 @@ index c187641f0ec6444a10e0e1583e1697d07e8f0267..361f8409415a160a1f7030193f9aca95
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -156,7 +160,7 @@ fun TaskContainer.registerRunTask(
+@@ -154,7 +158,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -42,7 +42,7 @@ index c187641f0ec6444a10e0e1583e1697d07e8f0267..361f8409415a160a1f7030193f9aca95
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 97745f0bab8d82d397c6c2a5775aed92bca0a034..b17a72020615e790d8f81c52774cbfa3fd703a2b 100644
+index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..921e8e75eba1c786e8b85abd6800895b260e8ca3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1697,7 +1697,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -55,10 +55,10 @@ index 97745f0bab8d82d397c6c2a5775aed92bca0a034..b17a72020615e790d8f81c52774cbfa3
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f..904c7ce28c54a6628874c0a18ded9bf11518d360 100644
+index 9c08303de2891de92e06de8a939a618b7a6f7321..630c29180771884b6b167ffaf3b7f6a7bac1e121 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
+@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {