From 00b28e1c3b5dcef02e52c817f398be7115b527ce Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 8 Jun 2023 15:27:41 +0200 Subject: [PATCH] Fix bad fixup --- patches/server/Build-system-changes.patch | 2 +- ...t-that-allowed-colored-signs-to-be-created.patch | 13 ------------- patches/server/Setup-Gradle-project.patch | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index 4a93c811cc..5d8ee56be2 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty } - val craftbukkitPackageVersion = "1_19_R3" // Paper + val craftbukkitPackageVersion = "1_20_R1" // Paper @@ -0,0 +0,0 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" diff --git a/patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch index eeccf72da7..1abb23d4e9 100644 --- a/patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/server/Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -4,19 +4,6 @@ Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created -diff --git a/build.gradle.kts b/build.gradle.kts -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -0,0 +0,0 @@ dependencies { - implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty - } - --val craftbukkitPackageVersion = "1_19_R3" // Paper -+val craftbukkitPackageVersion = "1_20_R1" // Paper - tasks.jar { - archiveClassifier.set("dev") - diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 49d7c64d33..8d3f51595a 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + testImplementation("org.hamcrest:hamcrest-library:1.3") +} + -+val craftbukkitPackageVersion = "1_19_R3" // Paper ++val craftbukkitPackageVersion = "1_20_R1" // Paper +tasks.jar { + archiveClassifier.set("dev") +