diff --git a/gradle.properties b/gradle.properties index ea2c023..111cbf6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19-R0.1-SNAPSHOT mcVersion=1.19 -paperRef=ee4916df7df294c51691fc68bef1e0bfd89016d9 +paperRef=bd097b4323daaf1e80f60e8c563f3312d2058f31 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 9ac83a8..2d714f7 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 eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..83005bdd467eb5385c959f77806738100a6fa5ae 100644 +index 68b8f275f9c9e77a949ca29749a05b469bcdb910..0a8f37d75b3c31ee2dd5b11a8b2ac48e34b84423 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,8 @@ plugins { @@ -19,7 +19,7 @@ index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..83005bdd467eb5385c959f7780673810 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -58,11 +58,17 @@ tasks.jar { +@@ -60,11 +60,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 eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..83005bdd467eb5385c959f7780673810 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -150,7 +156,7 @@ fun TaskContainer.registerRunTask( +@@ -152,7 +158,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -49,7 +49,7 @@ index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..83005bdd467eb5385c959f7780673810 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 9e1d3a22ed7e34e4968b5fb34cc77b661eb4747d..199cbfa43a642dfd0b0ed1e6cccfe1c8bcdf1c67 100644 +index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..163ba5ca27f268a17c5210663c6f767b8201ff63 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop