From 4f051cccc4eceba588ba39363462ef7d9db80c3f Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Tue, 28 Jun 2022 09:09:18 +0000 Subject: [PATCH] Update Paper --- build.gradle.kts | 2 +- gradle.properties | 2 +- patches/server/0001-Build-changes.patch | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 774831c5..f18f842c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java 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 92194641..8b59afbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ version = 1.19-R0.1-SNAPSHOT mcVersion = 1.19 packageVersion = 1_19_R0 org.gradle.jvmargs=-Xmx2G -paperRef=04d080ed82e7e2cf859bcec98b76a51fc7274893 +paperRef=1bd678c494009f2707b3cdf48ed10cd95b7e3fd5 diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index c147bb06..c4183d27 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..09cee4768d49615bf802e8cd74cefb5d86e1736c 100644 +index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..1b11cdd2bda26c5c0b7845f77e4b78523f6dac89 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,12 @@ plugins { @@ -39,7 +39,7 @@ index 68b8f275f9c9e77a949ca29749a05b469bcdb910..09cee4768d49615bf802e8cd74cefb5d "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -152,7 +156,7 @@ fun TaskContainer.registerRunTask( +@@ -163,7 +167,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -84,7 +84,7 @@ index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..fa777f327bb2e541ce72d29ec5505523 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..63892d8e3f7a36dbe8dd60d4d30a04e5ce4706a0 100644 +index 947bf593325cc00d9dc53ab0bf2b1b3ee578aef3..3e21b32555d660f34612a233b283522396c6aac3 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