From 1a9793197fadaa25520e2cbb7f5d26e23eca2572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 28 Feb 2016 19:33:05 +0100 Subject: GH-1502 move launch script generation to the Minecraft launch step --- logic/launch/steps/LaunchMinecraft.cpp | 3 +++ logic/launch/steps/LaunchMinecraft.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'logic/launch/steps') diff --git a/logic/launch/steps/LaunchMinecraft.cpp b/logic/launch/steps/LaunchMinecraft.cpp index b0fe056f..77a89f17 100644 --- a/logic/launch/steps/LaunchMinecraft.cpp +++ b/logic/launch/steps/LaunchMinecraft.cpp @@ -29,6 +29,9 @@ void LaunchMinecraft::executeTask() { auto instance = m_parent->instance(); std::shared_ptr minecraftInstance = std::dynamic_pointer_cast(instance); + + m_launchScript = minecraftInstance->createLaunchScript(m_session); + QStringList args = minecraftInstance->javaArguments(); // HACK: this is a workaround for MCL-3732 - 'server-resource-packs' is created. diff --git a/logic/launch/steps/LaunchMinecraft.h b/logic/launch/steps/LaunchMinecraft.h index 808ec33b..6b9f7919 100644 --- a/logic/launch/steps/LaunchMinecraft.h +++ b/logic/launch/steps/LaunchMinecraft.h @@ -17,6 +17,7 @@ #include #include +#include class LaunchMinecraft: public LaunchStep { @@ -31,9 +32,9 @@ public: return true; } void setWorkingDirectory(const QString &wd); - void setLaunchScript(const QString &ls) + void setAuthSession(AuthSessionPtr session) { - m_launchScript = ls; + m_session = session; } private slots: void on_state(LoggedProcess::State state); @@ -42,5 +43,6 @@ private: LoggedProcess m_process; QString m_command; QString m_launchScript; + AuthSessionPtr m_session; bool mayProceed = false; }; -- cgit v1.2.3