From 13320470dc42343648cac245ff8c6687b86278e2 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 29 Jul 2022 03:21:49 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@3b895f3 Updated Upstream (CraftBukkit) --- gradle.properties | 2 +- patches/server/0028-Disable-outdated-build-check.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 274a69a69..4f2054436 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.1-R0.1-SNAPSHOT -paperCommit = 2acb479b41f1b248761f4a9b2ade319273841758 +paperCommit = 3b895f36fdc7591c661ee9088d4813a6fed0bb3f org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0028-Disable-outdated-build-check.patch b/patches/server/0028-Disable-outdated-build-check.patch index 16af581cb..ede69be42 100644 --- a/patches/server/0028-Disable-outdated-build-check.patch +++ b/patches/server/0028-Disable-outdated-build-check.patch @@ -5,14 +5,14 @@ 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 2fae47d9e75a33416e27b6a2256365540149a571..1d2d36cf9befba024b82a0fe181811efd528ba2f 100644 +index 40d86147d4bfcab81c2b4e2d70f5ccdb8e25e606..5199e59c606833f90610f7360121e9628abafe2e 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -270,7 +270,7 @@ public class Main { System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } -- if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { +- if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { + if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { // Purpur Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper