External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-03 16:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE Add support for joining servers via Quick Play

Browse Source
This commit is contained in:
arthomnix
2023-04-08 10:29:12 +01:00
parent c1ed09e747
commit 22f82c34bf
4 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
launcher/minecraft/MinecraftInstance.cpp
View File

@@ -48,6 +48,7 @@
#include "MinecraftLoadAndCheck.h"
#include "minecraft/gameoptions/GameOptions.h"
#include "minecraft/update/FoldersTask.h"
#include "minecraft/VersionFilterData.h"
#define IBUS "@im=ibus"
@@ -425,10 +426,17 @@ QStringList MinecraftInstance::processMinecraftArgs(
if (serverToJoin && !serverToJoin->address.isEmpty())
{
args_pattern += " --server " + serverToJoin->address;
args_pattern += " --port " + QString::number(serverToJoin->port);
if (m_components->getComponent("net.minecraft")->getReleaseDateTime() >= g_VersionFilterData.quickPlayBeginsDate)
{
args_pattern += " --quickPlayMultiplayer " + serverToJoin->address + ":" + QString::number(serverToJoin->port);
}
else
{
args_pattern += " --server " + serverToJoin->address;
args_pattern += " --port " + QString::number(serverToJoin->port);
}
}
QMap<QString, QString> token_mapping;
// yggdrasil!
if(session) {
@@ -489,6 +497,7 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS
if (serverToJoin && !serverToJoin->address.isEmpty())
{
launchScript += "useQuickPlay " + QString::number(m_components->getComponent("net.minecraft")->getReleaseDateTime() >= g_VersionFilterData.quickPlayBeginsDate) + "\n";
launchScript += "serverAddress " + serverToJoin->address + "\n";
launchScript += "serverPort " + QString::number(serverToJoin->port) + "\n";
}