diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch
index bf5280f2ba..7a9ffb88fd 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 fee505024d..2d4dc479f9 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 aa4e78db31..7bd30d6e21 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 0000000000..58d2ef32ac
--- /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 <nassim@njahnke.dev>
+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 2c9d725e48..08c03dba17 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 bc6f962047..13b179cc69 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 3c2af1b7f5..35d3986e9e 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 3c2af1b7f5b43ed91c2e4096f1e164c551111074
+Subproject commit 35d3986e9ec4ffba0f025897ae87cd5991b9fa9a