diff --git a/patches/server/0003-Setup-Gradle-project.patch b/patches/server/0003-Setup-Gradle-project.patch
index 23b10a05..5bf20853 100644
--- a/patches/server/0003-Setup-Gradle-project.patch
+++ b/patches/server/0003-Setup-Gradle-project.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Setup Gradle project
 
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..c751b21fcf9b6b30b6546179ca11c9f6319f3370
+index 0000000000000000000000000000000000000000..a3683ff6a707c5966896a363afc39a0aa7c64390
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,132 @@
+@@ -0,0 +1,129 @@
 +plugins {
 +    id("pandaspigot.conventions")
 +    id("com.github.johnrengelman.shadow") version "7.1.2"
@@ -55,9 +55,6 @@ index 0000000000000000000000000000000000000000..c751b21fcf9b6b30b6546179ca11c9f6
 +        providers.gradleProperty("runWorkDir").forUseAtConfigurationTime().orElse("run")
 +    ).get().asFile
 +
-+    if (project.hasProperty("disableWatchdog")) {
-+        systemProperty("disable.watchdog", true)
-+    }
 +    doFirst {
 +        workingDir.mkdirs()
 +    }
diff --git a/patches/server/0006-Update-to-Netty-4.1.x.patch b/patches/server/0006-Update-to-Netty-4.1.x.patch
index b31f1a7c..4994f7af 100644
--- a/patches/server/0006-Update-to-Netty-4.1.x.patch
+++ b/patches/server/0006-Update-to-Netty-4.1.x.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update to Netty 4.1.x
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c751b21fcf9b6b30b6546179ca11c9f6319f3370..3e97931d3695e9b4e6aca80842832c65ad44bd06 100644
+index a3683ff6a707c5966896a363afc39a0aa7c64390..242341aea3f7515693240a643ca1f39846208a9d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ dependencies {
@@ -25,7 +25,7 @@ index c751b21fcf9b6b30b6546179ca11c9f6319f3370..3e97931d3695e9b4e6aca80842832c65
      implementation("net.sf.jopt-simple:jopt-simple:3.2")
      implementation("jline:jline:2.12.1")
  
-@@ -56,6 +55,7 @@ tasks {
+@@ -53,6 +52,7 @@ tasks {
      shadowJar {
          mergeServiceFiles()
          archiveClassifier.set("unmapped")
diff --git a/patches/server/0015-PandaSpigot-Configuration.patch b/patches/server/0015-PandaSpigot-Configuration.patch
index fe9a2a97..83e09a7e 100644
--- a/patches/server/0015-PandaSpigot-Configuration.patch
+++ b/patches/server/0015-PandaSpigot-Configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PandaSpigot Configuration
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3e97931d3695e9b4e6aca80842832c65ad44bd06..7c0bac5144853c7258bb65ddf6a0654ca5697269 100644
+index 242341aea3f7515693240a643ca1f39846208a9d..d130985a63c1074de418ce40a7035811a19e3115 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,12 @@ repositories {
@@ -21,7 +21,7 @@ index 3e97931d3695e9b4e6aca80842832c65ad44bd06..7c0bac5144853c7258bb65ddf6a0654c
      // Minecraft libraries:
      implementation("io.netty:netty-all:4.1.91.Final") // PandaSpigot - Update Netty to 4.1.x
      implementation("com.mojang:authlib:1.5.21")
-@@ -56,6 +62,13 @@ tasks {
+@@ -53,6 +59,13 @@ tasks {
          mergeServiceFiles()
          archiveClassifier.set("unmapped")
          append("META-INF/io.netty.versions.properties")
diff --git a/patches/server/0040-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0040-Use-TerminalConsoleAppender-for-console-improvements.patch
index 9688d2d3..3122441b 100644
--- a/patches/server/0040-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0040-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -22,7 +22,7 @@ This patch contains heavy inspiration from:
 https://github.com/PaperMC/Paper/blob/master/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7c0bac5144853c7258bb65ddf6a0654ca5697269..22b69df26679d07893224314d16483aa83b42004 100644
+index d130985a63c1074de418ce40a7035811a19e3115..4a1bd0cf33d98c8cd3e09c8ba92af080b2bd0324 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -21,8 +21,10 @@ dependencies {
@@ -55,7 +55,7 @@ index 7c0bac5144853c7258bb65ddf6a0654ca5697269..22b69df26679d07893224314d16483aa
      testImplementation("junit:junit:4.11")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
  }
-@@ -62,6 +68,7 @@ tasks {
+@@ -59,6 +65,7 @@ tasks {
          mergeServiceFiles()
          archiveClassifier.set("unmapped")
          append("META-INF/io.netty.versions.properties")