diff --git a/gradle.properties b/gradle.properties index 6a20c5a..56940cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.18.2-R0.1-SNAPSHOT mcVersion=1.18.2 -paperRef=af3b3778f6de06af48de08d41a43565d3ff19976 +paperRef=78e6431008d7d896f3b979feb897eecb09f69568 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 9ad3ec9..e419045 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 dd8f449dddbe0838835ae8f8d5033aa422db403d..4567cfddf92b21e5421c4f5596d754b0d3a2ca9f 100644 +index 0282e3b75470e1a68ea1fc228082483514ba432e..9e78384fdd5727143d3be5f189478ed701fbd0bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,8 @@ plugins { @@ -19,7 +19,7 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..4567cfddf92b21e5421c4f5596d754b0 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -55,11 +55,17 @@ tasks.jar { +@@ -56,11 +56,17 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper @@ -39,7 +39,7 @@ index dd8f449dddbe0838835ae8f8d5033aa422db403d..4567cfddf92b21e5421c4f5596d754b0 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -147,7 +153,7 @@ fun TaskContainer.registerRunTask( +@@ -148,7 +154,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -62,7 +62,7 @@ index c8d56947305c981a3268ce4ae3e975db350ceff2..f0ed55e2d9e1c1e3ba27bf675490c57d 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 ba4578fb4a2d861a6ffbb0ec022db31d9d7cc2be..19bd83d1f57f38b356a85dbe9dac421080e5c649 100644 +index ab843069ac0653d03cf3f925f49555016cad84fa..8e2902c9fc7d2f81a23fe0791da967f68a6194a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper