diff --git a/build.gradle.kts b/build.gradle.kts index b5b343a28..acdf00fc8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,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" } val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/" diff --git a/gradle.properties b/gradle.properties index 261bc30b4..da6e95302 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT -paperCommit = 37afe987d9fff5af72ea6f16807aa271fe70fbf1 +paperCommit = a22eb678af9555e7f55a03d397178e8b87d7c1ca org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch index edaf5bf1d..242200bbb 100644 --- a/patches/server/0003-Rebrand.patch +++ b/patches/server/0003-Rebrand.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index a4a146d9c3e07bdf941d81147ca31daf4689a687..00d128eba3e778927bc33b71c1145051a0c142f5 100644 +index 74c91f79576e85618fefb79be8d313ba871701c7..fd3805da1f276c76a2e814f755f6755245ec2ff4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { @@ -36,7 +36,7 @@ index a4a146d9c3e07bdf941d81147ca31daf4689a687..00d128eba3e778927bc33b71c1145051 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -172,7 +175,7 @@ fun TaskContainer.registerRunTask( +@@ -183,7 +186,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -231,7 +231,7 @@ index c31b9a6b1d4548d507ecb60d42ca9f96f49f6c4b..f613825c69a8d683b8029fe345031259 private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ba0412e8462372f5743e9282de6a50a45ee25add..8911766b8e7d4d30765cafe1533134d356bf60db 100644 +index 33218552405c526955d30031469d3044c724dde3..22d7c6ecc0e65751f82925d2e4c63d1dfef0c441 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