diff options
| author | Jake Potrebic <[email protected]> | 2024-04-10 14:29:12 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-04-10 14:29:12 -0700 |
| commit | c4435f4464310a9f2928a6625ca2411bb8977c39 (patch) | |
| tree | bbabfe8016436a4569d9396e0f174301a6025b94 | |
| parent | ddb2159d46b1b47aeba8dc6d16955c88ee06c66b (diff) | |
| download | Paper-c4435f4464310a9f2928a6625ca2411bb8977c39.tar.gz Paper-c4435f4464310a9f2928a6625ca2411bb8977c39.zip | |
fix compile issue
| -rw-r--r-- | patches/server/0006-MC-Dev-fixes.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch index 8dfbf39c27..ca597ecb37 100644 --- a/patches/server/0006-MC-Dev-fixes.patch +++ b/patches/server/0006-MC-Dev-fixes.patch @@ -26,6 +26,19 @@ index 1a4cab0b9995b733aa84b89129009a99177eee9b..ead823fa2a143acb05b33152ee1e5ee4 } } }; +diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java +index d14613f7d37198276c251e73703b060a971fac28..a6d8aca7533ad9a556d80b6dafdd93f94a7c23d6 100644 +--- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java ++++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java +@@ -307,7 +307,7 @@ public class BuiltInRegistries { + Bootstrap.checkBootstrapCalled(() -> "registry " + key); + ResourceLocation resourceLocation = key.location(); + LOADERS.put(resourceLocation, () -> initializer.run(registry)); +- WRITABLE_REGISTRY.register((ResourceKey<WritableRegistry<?>>)key, registry, lifecycle); ++ WRITABLE_REGISTRY.register((ResourceKey)key, registry, lifecycle); + return registry; + } + diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java index 68ccf051f5a769abaa0bf9508add9303c56a1193..9d6dafb4855af9ccb7bc033ebf0fca5f75ceb9c6 100644 --- a/src/main/java/net/minecraft/network/ConnectionProtocol.java |