From 2689c8d04f72c9540830f47ba662def65cf4351b Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 7 Jul 2021 19:18:05 +0200 Subject: [PATCH] Drop no longer needed patch (#6115) --- ...ktraces-in-log-messages-crash-report.patch | 4 ++-- ...ommand-click-events-through-normal-c.patch | 2 +- .../server/Update-oshi-core-dependency.patch | 20 ------------------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 patches/server/Update-oshi-core-dependency.patch diff --git a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 74a3680985..f936417e85 100644 --- a/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -38,8 +38,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 dependencies { @@ -0,0 +0,0 @@ dependencies { - - implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning + implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper + implementation("io.netty:netty-all:4.1.65.Final") // Paper + implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation + diff --git a/patches/server/Route-sign-run_command-click-events-through-normal-c.patch b/patches/server/Route-sign-run_command-click-events-through-normal-c.patch index 78a4226955..502264f1ff 100644 --- a/patches/server/Route-sign-run_command-click-events-through-normal-c.patch +++ b/patches/server/Route-sign-run_command-click-events-through-normal-c.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MD <1917406+mdcfe@users.noreply.github.com> +From: mdcfe <1917406+mdcfe@users.noreply.github.com> Date: Wed, 7 Jul 2021 12:29:48 +0100 Subject: [PATCH] Route sign run_command click events through normal chat logic diff --git a/patches/server/Update-oshi-core-dependency.patch b/patches/server/Update-oshi-core-dependency.patch deleted file mode 100644 index ae86648ec6..0000000000 --- a/patches/server/Update-oshi-core-dependency.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke -Date: Sat, 19 Jun 2021 09:55:41 +0200 -Subject: [PATCH] Update oshi-core dependency - -This is fixed in Vanilla 1.17.1, so remove this patch when updating. - -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("co.aikar:cleaner:1.0-SNAPSHOT") // Paper - implementation("io.netty:netty-all:4.1.65.Final") // Paper - -+ implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning -+ - testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test - testImplementation("junit:junit:4.13.1") - testImplementation("org.hamcrest:hamcrest-library:1.3")