From dedb7a2343f7d433492dee5930802ed47294b722 Mon Sep 17 00:00:00 2001 From: sshcrack <34072808+sshcrack@users.noreply.github.com> Date: Sun, 8 Dec 2024 14:17:04 +0100 Subject: [PATCH 1/2] change order of steps Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com> --- launcher/minecraft/MinecraftInstance.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 98ac7647f..e35dd973e 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -1083,6 +1083,12 @@ shared_qobject_ptr MinecraftInstance::createLaunchTask(AuthSessionPt process->appendStep(step); } + // check java + { + process->appendStep(makeShared(pptr)); + process->appendStep(makeShared(pptr)); + } + // run pre-launch command if that's needed if (getPreLaunchCommand().size()) { auto step = makeShared(pptr); @@ -1096,12 +1102,6 @@ shared_qobject_ptr MinecraftInstance::createLaunchTask(AuthSessionPt process->appendStep(makeShared(pptr, makeShared(this, mode, pptr))); } - // check java - { - process->appendStep(makeShared(pptr)); - process->appendStep(makeShared(pptr)); - } - // if we aren't in offline mode,. if (session->status != AuthSession::PlayableOffline) { if (!session->demo) { From cf2dcbd431b0c4bb03ff527465f972d72f713b0c Mon Sep 17 00:00:00 2001 From: sshcrack <34072808+sshcrack@users.noreply.github.com> Date: Sun, 8 Dec 2024 18:27:57 +0100 Subject: [PATCH 2/2] load meta first Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com> --- launcher/minecraft/MinecraftInstance.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index e35dd973e..995dd15d7 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -1083,6 +1083,12 @@ shared_qobject_ptr MinecraftInstance::createLaunchTask(AuthSessionPt process->appendStep(step); } + // load meta + { + auto mode = session->status != AuthSession::PlayableOffline ? Net::Mode::Online : Net::Mode::Offline; + process->appendStep(makeShared(pptr, makeShared(this, mode, pptr))); + } + // check java { process->appendStep(makeShared(pptr)); @@ -1096,12 +1102,6 @@ shared_qobject_ptr MinecraftInstance::createLaunchTask(AuthSessionPt process->appendStep(step); } - // load meta - { - auto mode = session->status != AuthSession::PlayableOffline ? Net::Mode::Online : Net::Mode::Offline; - process->appendStep(makeShared(pptr, makeShared(this, mode, pptr))); - } - // if we aren't in offline mode,. if (session->status != AuthSession::PlayableOffline) { if (!session->demo) {