From 52dc8f85a73889968e22cd05e99e86272aac4216 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 11 May 2021 19:19:21 -0400 Subject: [PATCH] clientloader: don't use fallback config or client when jav_config is manually specified --- .../src/main/java/net/runelite/client/rs/ClientLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 68b8d13c0f..bc7a98faef 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -143,7 +143,7 @@ public class ClientLoader implements Supplier catch (IOException ex) { // try again with the fallback config and gamepack - if (!config.isFallback()) + if (javConfigUrl.equals(RuneLiteProperties.getJavConfig()) && !config.isFallback()) { log.warn("Unable to download game client, attempting to use fallback config", ex); config = downloadFallbackConfig(); @@ -404,7 +404,7 @@ public class ClientLoader implements Supplier log.warn("Failed to download gamepack from \"{}\"", url, e); // With fallback config do 1 attempt (there are no additional urls to try) - if (config.isFallback() || attempt >= NUM_ATTEMPTS) + if (!javConfigUrl.equals(RuneLiteProperties.getJavConfig()) || config.isFallback() || attempt >= NUM_ATTEMPTS) { throw e; }