diff --git a/Jenkinsfile b/Jenkinsfile index b04fecd..c6e3fd2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { } post { always { - // archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true + archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true junit 'Scissors-Server/build/test-results/test/*.xml' junit 'Scissors-API/build/test-results/test/*.xml' cleanWs() diff --git a/gradle.properties b/gradle.properties index 9ba9336..c153f6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19.4-R0.1-SNAPSHOT mcVersion=1.19.4 -paperRef=4f933b24058ec502da86da7b06087cd9477b1258 +paperRef=83948f6f5901edf27e83d8aa5bdca10f1eff63d8 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 1e07111..eb4f129 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -51,10 +51,10 @@ index 9cf389defdaeb887e9cad4f0fed3f3b95667b238..e92a7dd91f4b4771d8087a5fbeed2259 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 081871412e92ce909ad9c51a8d18ede53596c049..f26e4dbdc4cbe7b732d890335759fe3cd5d5aab1 100644 +index 4450d825a5474da211f0e83f845d8c7129fa08aa..c5cf50f8eb039e7e5f3b5a991d715e5f145d739d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1680,7 +1680,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop