aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-12-23 15:08:42 -0800
committerJake Potrebic <[email protected]>2024-12-23 15:08:43 -0800
commitcb8d2c4b465005a0fe9d3b2c7c95a3a8aeb81b2e (patch)
tree663b4429b37ee596a97d80063300b2c0c25f977b
parent011b91b1da4ecf5c08483deb960d6f71a5e43fbd (diff)
downloadPaper-fix/disabling-vanilla-registry-values.tar.gz
Paper-fix/disabling-vanilla-registry-values.zip
include actual class load diff (was dropped)fix/disabling-vanilla-registry-values
-rw-r--r--paper-server/patches/sources/net/minecraft/core/registries/BuiltInRegistries.java.patch13
1 files 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);
}