From 500132da33a798b8ad3e16a19df85d19956e1656 Mon Sep 17 00:00:00 2001 From: Griefed Date: Fri, 20 Sep 2024 19:34:34 +0200 Subject: [PATCH 1/2] refactor: Trim error message --- .../griefed/serverpackcreator/app/gui/window/UpdateDialogs.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/UpdateDialogs.kt b/serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/UpdateDialogs.kt index decd210e7..04065cdf5 100644 --- a/serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/UpdateDialogs.kt +++ b/serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/UpdateDialogs.kt @@ -239,7 +239,7 @@ class UpdateDialogs( val cause = e.cause // UserCanceledException means that the user has canceled the proxy dialog if (cause !is UserCanceledException) { - log.error("Update could not be executed.", e) + log.error("Update could not be executed: ${e.message}.") } } } From 6d1a85539c136251ff556e492629a14d55e3fa23 Mon Sep 17 00:00:00 2001 From: Griefed Date: Fri, 20 Sep 2024 19:37:07 +0200 Subject: [PATCH 2/2] fix: Fetch correct fallback property during clientside-mod list comparison --- .../kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt b/serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt index a5ff2a696..0710d18c8 100644 --- a/serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt +++ b/serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt @@ -2590,7 +2590,7 @@ class ApiProperties(propertiesFile: File = File("serverpackcreator.properties")) } fallbackUpdated = false if (properties != null) { - val newBlacklist = properties!!.getProperty(pConfigurationFallbackModsWhiteList) + val newBlacklist = properties!!.getProperty(pConfigurationFallbackModsList) val currentBlacklist = internalProps.getProperty(pConfigurationFallbackModsList) if (newBlacklist != null && currentBlacklist != newBlacklist) { internalProps.setProperty(pConfigurationFallbackModsList, newBlacklist)