From fd00822015964574f6e12118d33341e04e05994e Mon Sep 17 00:00:00 2001 From: Dennis C Date: Tue, 28 Jun 2022 05:54:54 +0200 Subject: [PATCH] Fix default audio device config loading string comparison issue (#8767) --- .../minecraft/net/minecraft/client/Options.java.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/patches/minecraft/net/minecraft/client/Options.java.patch b/patches/minecraft/net/minecraft/client/Options.java.patch index d2e11e5892..3cb022dd86 100644 --- a/patches/minecraft/net/minecraft/client/Options.java.patch +++ b/patches/minecraft/net/minecraft/client/Options.java.patch @@ -1,5 +1,15 @@ --- a/net/minecraft/client/Options.java +++ b/net/minecraft/client/Options.java +@@ -515,7 +_,8 @@ + }, new OptionInstance.LazyEnum<>(() -> { + return Stream.concat(Stream.of(""), Minecraft.m_91087_().m_91106_().m_194525_().stream()).toList(); + }, (p_232011_) -> { +- return Minecraft.m_91087_().m_91396_() && p_232011_ != "" && !Minecraft.m_91087_().m_91106_().m_194525_().contains(p_232011_) ? Optional.empty() : Optional.of(p_232011_); ++ // FORGE: fix incorrect string comparison - PR #8767 ++ return Minecraft.m_91087_().m_91396_() && (p_232011_ == null || !p_232011_.isEmpty()) && !Minecraft.m_91087_().m_91106_().m_194525_().contains(p_232011_) ? Optional.empty() : Optional.of(p_232011_); + }, Codec.STRING), "", (p_231994_) -> { + SoundManager soundmanager = Minecraft.m_91087_().m_91106_(); + soundmanager.m_194526_(); @@ -772,6 +_,7 @@ }