Merge branch '1.20.4' into 1.20.6

rfresh2 · Jun 10, 2024 · 6d23d9a · 6d23d9a
2 parents 45cec5d + c18ce20
commit 6d23d9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -110,9 +110,9 @@ dependencies {
     shade("com.github.rfresh2.fastutil:int-int-maps:$fastutilVersion")
     shade("com.github.rfresh2.fastutil:reference-object-maps:$fastutilVersion")
     shade("com.github.rfresh2.fastutil:int-queues:$fastutilVersion")
-    shade("net.raphimc:ViaLoader:3.0.0-20240603.155811-3")
-    shade("com.viaversion:viaversion:5.0.0-20240603.132511-36")
-    shade("com.viaversion:viabackwards:5.0.0-20240603.183511-16")
+    shade("net.raphimc:ViaLoader:3.0.0-20240604.224010-5")
+    shade("com.viaversion:viaversion:5.0.0-20240609.151013-46")
+    shade("com.viaversion:viabackwards:5.0.0-20240608.181111-24")
     shade("org.jline:jline:3.26.1")
     shade("org.jline:jline-terminal-jansi:3.26.1")
     shade("ar.com.hjg:pngj:2.1.0")

diff --git a/src/main/java/com/zenith/Proxy.java b/src/main/java/com/zenith/Proxy.java
@@ -187,7 +187,7 @@ public void start() {
                 DEFAULT_LOG.info("Started AutoUpdater");
             }
             DEFAULT_LOG.info("ZenithProxy started!");
-            if (LAUNCH_CONFIG.release_channel.endsWith(".pre")) {
+            if (!DISCORD.isRunning() && LAUNCH_CONFIG.release_channel.endsWith(".pre")) {
                 DEFAULT_LOG.warn("You are currently using a ZenithProxy prerelease");
                 DEFAULT_LOG.warn("Prereleases include experiments that may contain bugs and are not always updated with fixes");
                 DEFAULT_LOG.warn("Switch to a stable release with the `channel` command");