From cb8d2c4b465005a0fe9d3b2c7c95a3a8aeb81b2e Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Mon, 23 Dec 2024 15:08:42 -0800
Subject: [PATCH] include actual class load diff (was dropped)

---
 .../core/registries/BuiltInRegistries.java.patch    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/paper-server/patches/sources/net/minecraft/core/registries/BuiltInRegistries.java.patch b/paper-server/patches/sources/net/minecraft/core/registries/BuiltInRegistries.java.patch
index 0d1d444e1b..b8f5aa6ff5 100644
--- a/paper-server/patches/sources/net/minecraft/core/registries/BuiltInRegistries.java.patch
+++ b/paper-server/patches/sources/net/minecraft/core/registries/BuiltInRegistries.java.patch
@@ -26,7 +26,7 @@
          ResourceLocation resourceLocation = key.location();
          LOADERS.put(resourceLocation, () -> bootstrap.run(registry));
          WRITABLE_REGISTRY.register((ResourceKey)key, registry, RegistrationInfo.BUILT_IN);
-@@ -328,7 +_,14 @@
+@@ -328,16 +_,31 @@
      }
  
      public static void bootStrap() {
@@ -41,7 +41,16 @@
          freeze();
          validate(REGISTRY);
      }
-@@ -338,6 +_,7 @@
+ 
+     private static void createContents() {
++        // Paper start - class-load org.bukkit.Registry
++        try {
++            Class.forName(org.bukkit.Registry.class.getName());
++        } catch (final ClassNotFoundException ex) {
++            throw new RuntimeException(ex);
++        }
++        // Paper end - class-load org.bukkit.Registry
+         LOADERS.forEach((resourceLocation, supplier) -> {
              if (supplier.get() == null) {
                  LOGGER.error("Unable to bootstrap registry '{}'", resourceLocation);
              }