From 6f8ba9d2951a913686464c79edd1cd85eb3fb7d6 Mon Sep 17 00:00:00 2001 From: SizableShrimp Date: Thu, 29 Sep 2022 23:23:19 -0500 Subject: [PATCH] Fix ServiceLoader bug Signed-off-by: SizableShrimp --- .../multiplayer/resolver/AddressCheck.java.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 patches/minecraft/net/minecraft/client/multiplayer/resolver/AddressCheck.java.patch diff --git a/patches/minecraft/net/minecraft/client/multiplayer/resolver/AddressCheck.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/resolver/AddressCheck.java.patch new file mode 100644 index 0000000000..9e8650204c --- /dev/null +++ b/patches/minecraft/net/minecraft/client/multiplayer/resolver/AddressCheck.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/client/multiplayer/resolver/AddressCheck.java ++++ b/net/minecraft/client/multiplayer/resolver/AddressCheck.java +@@ -16,7 +_,7 @@ + boolean m_142408_(ServerAddress p_171830_); + + static AddressCheck m_171828_() { +- final ImmutableList> immutablelist = Streams.stream(ServiceLoader.load(BlockListSupplier.class)).map(BlockListSupplier::createBlockList).filter(Objects::nonNull).collect(ImmutableList.toImmutableList()); ++ final ImmutableList> immutablelist = Streams.stream(ServiceLoader.load(BlockListSupplier.class, net.minecraftforge.fml.loading.FMLLoader.class.getClassLoader())).map(BlockListSupplier::createBlockList).filter(Objects::nonNull).collect(ImmutableList.toImmutableList()); + return new AddressCheck() { + public boolean m_142649_(ResolvedServerAddress p_171835_) { + String s = p_171835_.m_142727_();