diff --git a/build.gradle.kts b/build.gradle.kts index 4239885..42288b1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.3.7" + id("io.papermc.paperweight.patcher") version "1.3.8" } repositories { diff --git a/gradle.properties b/gradle.properties index c6e310b..15c4d09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = gg.projecteden.parchment version = 1.19-R0.1-SNAPSHOT mcVersion = 1.19 -paperRef = e52499e41d3a035d852e566288c31c7113160bb9 +paperRef = 1bd678c494009f2707b3cdf48ed10cd95b7e3fd5 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 947068f..4169e0a 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 68b8f275f9c9e77a949ca29749a05b469bcdb910..82d6922ca22eee74de2140789787e6e5da51378c 100644 +index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..2d10b9122ab07ab4ab72d2f33aeb12fc599e54d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,8 @@ plugins { @@ -57,7 +57,7 @@ index 68b8f275f9c9e77a949ca29749a05b469bcdb910..82d6922ca22eee74de2140789787e6e5 } } -@@ -152,7 +172,7 @@ fun TaskContainer.registerRunTask( +@@ -163,7 +183,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -117,7 +117,7 @@ index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..518b6dfd4dd083e23ae519061664e74c 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 61c2f864bb23e75f6c377f7ccbf2ec44a670348c..a50a6f14e03f2b709b36126af263b29c56fd9f51 100644 +index 947bf593325cc00d9dc53ab0bf2b1b3ee578aef3..4ce20de3ef07f2cbd49ecebff0463269719178e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -245,7 +245,7 @@ import javax.annotation.Nullable; // Paper