diff options
| author | Janrupf <business.janrupf@gmail.com> | 2021-05-22 16:32:15 +0200 |
|---|---|---|
| committer | Janrupf <business.janrupf@gmail.com> | 2021-05-22 16:33:16 +0200 |
| commit | 0ccd7223fd554f86272dbffddd2e7818c26ffa53 (patch) | |
| tree | 78b0407a7ee27fc02a2aef7e40ca9a42a3e6fcd0 /api/logic | |
| parent | 23a706bbaebcc8ec9126d019a276c158581bdb53 (diff) | |
| download | PrismLauncher-0ccd7223fd554f86272dbffddd2e7818c26ffa53.tar.gz PrismLauncher-0ccd7223fd554f86272dbffddd2e7818c26ffa53.tar.bz2 PrismLauncher-0ccd7223fd554f86272dbffddd2e7818c26ffa53.zip | |
NOISSUE Make LauncherPart aware of server to join
Diffstat (limited to 'api/logic')
| -rw-r--r-- | api/logic/minecraft/MinecraftInstance.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp index e426d5c4..54c7f594 100644 --- a/api/logic/minecraft/MinecraftInstance.cpp +++ b/api/logic/minecraft/MinecraftInstance.cpp @@ -474,8 +474,17 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS launchScript += "appletClass " + appletClass + "\n"; } + if (serverToJoin && !serverToJoin->address.isEmpty()) + { + launchScript += "serverAddress " + serverToJoin->address + "\n"; + launchScript += "serverPort " + QString::number(serverToJoin->port) + "\n"; + } + // generic minecraft params - for (auto param : processMinecraftArgs(session, serverToJoin)) + for (auto param : processMinecraftArgs( + session, + nullptr /* When using a launch script, the server parameters are handled by it*/ + )) { launchScript += "param " + param + "\n"; } |