From 291955ea75062358d7adc4c0458b561eace3bae1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 16 Mar 2022 16:47:25 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f35a0ce Remove Java version check once and for all (#7612) PaperMC/Paper@1c5f8b0 Updated Upstream (Bukkit/CraftBukkit) (#7604) PaperMC/Paper@f0d0078 Add debug for invalid GameProfiles on skull blocks/items (#7512) --- gradle.properties | 2 +- patches/server/0026-Disable-outdated-build-check.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index cd96f8f2c..eb23914a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.18.2-R0.1-SNAPSHOT -paperCommit = 2d3e8f772905fd0e77abf90857962033e5d211f2 +paperCommit = f0d0078debda4e6b306cf53a697e798cc2cd084d org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0026-Disable-outdated-build-check.patch b/patches/server/0026-Disable-outdated-build-check.patch index 358a8cab7..9aba710b4 100644 --- a/patches/server/0026-Disable-outdated-build-check.patch +++ b/patches/server/0026-Disable-outdated-build-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 9d649923e28f4839106b336fce41bd3f4114faae..6f14a1b26e92d0170538ed60c6a651a031e7209e 100644 +index dd8ab900bb3ff451c7c200f9cb3e3eca3e78a2c6..639dc3bb56cc90b84da08dc93cea89c658ed6dc8 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -269,7 +269,7 @@ public class Main { +@@ -265,7 +265,7 @@ public class Main { System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper }