From fdc05f6348e9e20b3c73958d876976a3abfa97c1 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 14 Dec 2022 17:50:32 +0100 Subject: [PATCH] init skins after setting the player This fixes a critical loading crash --- .../minosoft/protocol/network/connection/play/PlayConnection.kt | 1 + .../network/connection/play/settings/ClientSettingsManager.kt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt index 7388e0687..cb5290cb8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/PlayConnection.kt @@ -218,6 +218,7 @@ class PlayConnection( language = LanguageUtil.load(profiles.connection.language ?: profiles.eros.general.language, version, assetsManager) player = LocalPlayerEntity(account, this, privateKey) + settingsManager.initSkins() if (!RunConfiguration.DISABLE_RENDERING) { val rendering = Rendering(this) diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt index 9ccfdafbe..5e365aca6 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/settings/ClientSettingsManager.kt @@ -47,7 +47,9 @@ class ClientSettingsManager( profile::language.observe(this) { sendLanguage() } connection.profiles.eros.general::language.observe(this) { sendLanguage() } + } + fun initSkins() { connection.profiles.connection.skin::parts.observeSet(this, true) { connection.player.skinParts += it.adds; connection.player.skinParts -= it.removes } }