diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-05-21 11:43:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-21 11:43:19 +0200 |
| commit | 482e049ac7eb4d77c5c7a655b28820a2a643785d (patch) | |
| tree | ef0652009e1d263767f4faa656625a4f4414b198 | |
| parent | 92e8aaf36f72b7527322add169b253d0698939d0 (diff) | |
| parent | 96f16069a93afa320de174e740bc6b915e9a1103 (diff) | |
| download | PrismLauncher-482e049ac7eb4d77c5c7a655b28820a2a643785d.tar.gz PrismLauncher-482e049ac7eb4d77c5c7a655b28820a2a643785d.tar.bz2 PrismLauncher-482e049ac7eb4d77c5c7a655b28820a2a643785d.zip | |
Merge pull request #606 from jamierocks/h-launch-version
| -rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 6 | ||||
| -rw-r--r-- | launcher/minecraft/VersionFile.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index e20dc24c..61326fac 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -2,6 +2,7 @@ /* * PolyMC - Minecraft Launcher * Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> + * Copyright (C) 2022 Jamie Mansfield <jmansfield@cadixdev.org> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -487,9 +488,8 @@ QStringList MinecraftInstance::processMinecraftArgs( } } - // blatant self-promotion. - token_mapping["profile_name"] = token_mapping["version_name"] = BuildConfig.LAUNCHER_NAME; - + token_mapping["profile_name"] = name(); + token_mapping["version_name"] = profile->getMinecraftVersion(); token_mapping["version_type"] = profile->getMinecraftVersionType(); QString absRootDir = QDir(gameRoot()).absolutePath(); diff --git a/launcher/minecraft/VersionFile.cpp b/launcher/minecraft/VersionFile.cpp index 9db30ba2..f242fbe7 100644 --- a/launcher/minecraft/VersionFile.cpp +++ b/launcher/minecraft/VersionFile.cpp @@ -2,6 +2,7 @@ /* * PolyMC - Minecraft Launcher * Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> + * Copyright (C) 2022 Jamie Mansfield <jmansfield@cadixdev.org> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -55,7 +56,7 @@ void VersionFile::applyTo(LaunchProfile *profile) // Only real Minecraft can set those. Don't let anything override them. if (isMinecraftVersion(uid)) { - profile->applyMinecraftVersion(minecraftVersion); + profile->applyMinecraftVersion(version); profile->applyMinecraftVersionType(type); // HACK: ignore assets from other version files than Minecraft // workaround for stupid assets issue caused by amazon: |