From fda4e8e392a4d12ea98f3e6919e69f7b408071d0 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 9 Dec 2021 21:59:59 +0100 Subject: [PATCH] Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 35d3986e Disable log4j message formatting 040e0c3b Increase outdated build delay --- patches/server/Adventure.patch | 4 ++-- .../server/Backport-log4j-2.15.0-bugfix.patch | 3 ++- patches/server/Build-system-changes.patch | 2 +- .../server/Don-t-disable-log4j-lookups.patch | 19 +++++++++++++++++++ patches/server/Fix-this-stupid-bullshit.patch | 2 +- ...ient-crashes-server-lists-and-Mojang.patch | 2 +- work/CraftBukkit | 2 +- 7 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 patches/server/Don-t-disable-log4j-lookups.patch diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch index bf5280f2ba2..7a9ffb88fdd 100644 --- a/patches/server/Adventure.patch +++ b/patches/server/Adventure.patch @@ -1895,9 +1895,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ public class Main { - public static boolean useConsole = true; - public static void main(String[] args) { + System.setProperty("log4j2.formatMsgNoLookups", "true"); + + // Paper start + final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected"); + if (false && System.getProperty(warnWhenLegacyFormattingDetected) == null) { diff --git a/patches/server/Backport-log4j-2.15.0-bugfix.patch b/patches/server/Backport-log4j-2.15.0-bugfix.patch index fee505024da..2d4dc479f94 100644 --- a/patches/server/Backport-log4j-2.15.0-bugfix.patch +++ b/patches/server/Backport-log4j-2.15.0-bugfix.patch @@ -261,7 +261,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + } + } catch (URISyntaxException ex) { -+ // This is OK. ++ LOGGER.warn("Invalid JNDI URI - {}", name); ++ return null; + } return (T) this.context.lookup(name); } diff --git a/patches/server/Build-system-changes.patch b/patches/server/Build-system-changes.patch index aa4e78db31f..7bd30d6e21e 100644 --- a/patches/server/Build-system-changes.patch +++ b/patches/server/Build-system-changes.patch @@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -14); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/patches/server/Don-t-disable-log4j-lookups.patch b/patches/server/Don-t-disable-log4j-lookups.patch new file mode 100644 index 00000000000..58d2ef32ac9 --- /dev/null +++ b/patches/server/Don-t-disable-log4j-lookups.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke +Date: Thu, 9 Dec 2021 21:59:08 +0100 +Subject: [PATCH] Don't disable log4j lookups + + +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -0,0 +0,0 @@ public class Main { + public static boolean useConsole = true; + + public static void main(String[] args) { +- System.setProperty("log4j2.formatMsgNoLookups", "true"); ++ //System.setProperty("log4j2.formatMsgNoLookups", "true"); // Paper - no... + + // Paper start + final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected"); diff --git a/patches/server/Fix-this-stupid-bullshit.patch b/patches/server/Fix-this-stupid-bullshit.patch index 2c9d725e48f..08c03dba17e 100644 --- a/patches/server/Fix-this-stupid-bullshit.patch +++ b/patches/server/Fix-this-stupid-bullshit.patch @@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ public class Main { Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -14); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit diff --git a/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index bc6f962047a..13b179cc690 100644 --- a/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -14); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***"); diff --git a/work/CraftBukkit b/work/CraftBukkit index 3c2af1b7f5b..35d3986e9ec 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 3c2af1b7f5b43ed91c2e4096f1e164c551111074 +Subproject commit 35d3986e9ec4ffba0f025897ae87cd5991b9fa9a