diff --git a/Spigot-API-Patches/Prioritise-own-classes-where-possible.patch b/Spigot-API-Patches/Prioritise-own-classes-where-possible.patch
index f72e697a46..3826df3296 100644
--- a/Spigot-API-Patches/Prioritise-own-classes-where-possible.patch
+++ b/Spigot-API-Patches/Prioritise-own-classes-where-possible.patch
@@ -76,11 +76,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private final File file;
      private final JarFile jar;
 @@ -0,0 +0,0 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
-         }
  
          if (checkGlobal) {
+             // This ignores the libraries of other plugins, unless they are transitive dependencies.
 -            Class<?> result = loader.getClassByName(name, resolve, description);
 +            Class<?> result = loader.getClassByName(name, resolve, description, this);  // Paper - prioritize self
  
-             if (result != null) {
-                 PluginDescriptionFile provider = ((PluginClassLoader) result.getClassLoader()).description;
+             // If the class was loaded from a library instead of a PluginClassLoader, we can assume that its associated plugin is a transitive dependency and can therefore skip this check.
+             if (result != null && result.getClassLoader() instanceof PluginClassLoader) {
diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index 59dfc305ee..6d7520f4ad 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -270,7 +270,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class Main {
                  }
  
-                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+                 if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 -                    Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
 +                    Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
diff --git a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch
index c39bcbe698..029125f61a 100644
--- a/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -339,7 +339,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
-                 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+                 if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 @@ -0,0 +0,0 @@ public class Main {
                      System.out.println("Unable to read system info");
                  }
diff --git a/work/Bukkit b/work/Bukkit
index 04df07fe9a..7e29f76544 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 04df07fe9a45f382bedd4ee83948382d3e7baae8
+Subproject commit 7e29f7654411f0a17ebbcc2c3f6a7dfe93bff39e
diff --git a/work/CraftBukkit b/work/CraftBukkit
index fae895ac11..296df56673 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit fae895ac110a830e4bbd5cc9eadbf70104ce215e
+Subproject commit 296df56673771692593156995684ab8041925d9d