From c6ccd9b4bc19aa7b292e67e3525cd797eae40c19 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Thu, 23 Nov 2023 21:32:02 +0100 Subject: [PATCH] profiles: properly store and load forced version --- .../minosoft/config/profile/profiles/account/AccountProfile.kt | 2 +- .../config/profile/profiles/eros/server/entries/ErosServer.kt | 2 +- src/main/java/de/bixilon/minosoft/main/MinosoftBoot.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/account/AccountProfile.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/account/AccountProfile.kt index a35f443e2..671b1d464 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/account/AccountProfile.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/account/AccountProfile.kt @@ -69,7 +69,7 @@ class AccountProfile( init { this::selected.observe(this) { _selected = it?.id } - this::_selected.observe(this) { selected = entries[it] } + this::_selected.observe(this, true) { selected = entries[it] } } override fun toString(): String { diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/server/entries/ErosServer.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/server/entries/ErosServer.kt index 6e976284c..9777db905 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/server/entries/ErosServer.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/eros/server/entries/ErosServer.kt @@ -74,7 +74,7 @@ class ErosServer( init { this::forcedVersion.observe(this) { _forcedVersion = it?.name } - this::_forcedVersion.observe(this) { this.forcedVersion = Versions[it] } + this::_forcedVersion.observe(this, true) { this.forcedVersion = Versions[it] } } @get:JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/src/main/java/de/bixilon/minosoft/main/MinosoftBoot.kt b/src/main/java/de/bixilon/minosoft/main/MinosoftBoot.kt index 53a2a3c17..faeed50ba 100644 --- a/src/main/java/de/bixilon/minosoft/main/MinosoftBoot.kt +++ b/src/main/java/de/bixilon/minosoft/main/MinosoftBoot.kt @@ -37,7 +37,7 @@ object MinosoftBoot { fun register(worker: TaskWorker) { worker += WorkerTask(identifier = BootTasks.VERSIONS, priority = ThreadPool.HIGHER, executor = VersionLoader::load) - worker += WorkerTask(identifier = BootTasks.PROFILES, priority = ThreadPool.HIGHEST, executor = ProfileManagers::load) + worker += WorkerTask(identifier = BootTasks.PROFILES, dependencies = arrayOf(BootTasks.VERSIONS), priority = ThreadPool.HIGHEST, executor = ProfileManagers::load) // servers might have a version set worker += WorkerTask(identifier = BootTasks.ASSETS_PROPERTIES, dependencies = arrayOf(BootTasks.VERSIONS), executor = AssetsVersionProperties::load) worker += WorkerTask(identifier = BootTasks.DEFAULT_REGISTRIES, dependencies = arrayOf(BootTasks.VERSIONS), executor = { MinosoftMeta.load(); FallbackTags.load(); FallbackRegistries.load(); EntityEvents.load() })