summaryrefslogtreecommitdiffstats
path: root/logic/minecraft/onesix/OneSixInstance.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-03-21 02:19:23 +0100
committerPetr Mrázek <peterix@gmail.com>2016-03-26 17:05:27 +0100
commitd587720010036e3335e321f192449808a75e958b (patch)
treeda8bafcd9638be6db9f1752c1a475a9099996591 /logic/minecraft/onesix/OneSixInstance.cpp
parent2929ca74134758bf473cdf6184a045aa863b07cf (diff)
downloadMultiMC-d587720010036e3335e321f192449808a75e958b.tar
MultiMC-d587720010036e3335e321f192449808a75e958b.tar.gz
MultiMC-d587720010036e3335e321f192449808a75e958b.tar.lz
MultiMC-d587720010036e3335e321f192449808a75e958b.tar.xz
MultiMC-d587720010036e3335e321f192449808a75e958b.zip
NOISSUE use new mojang assets locations
Diffstat (limited to 'logic/minecraft/onesix/OneSixInstance.cpp')
-rw-r--r--logic/minecraft/onesix/OneSixInstance.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/logic/minecraft/onesix/OneSixInstance.cpp b/logic/minecraft/onesix/OneSixInstance.cpp
index f8b274ff..328c3b38 100644
--- a/logic/minecraft/onesix/OneSixInstance.cpp
+++ b/logic/minecraft/onesix/OneSixInstance.cpp
@@ -125,14 +125,15 @@ QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session)
QString absRootDir = QDir(minecraftRoot()).absolutePath();
token_mapping["game_directory"] = absRootDir;
QString absAssetsDir = QDir("assets/").absolutePath();
- token_mapping["game_assets"] = AssetsUtils::reconstructAssets(m_profile->getMinecraftAssets()).absolutePath();
+ auto assets = m_profile->getMinecraftAssets();
+ token_mapping["game_assets"] = AssetsUtils::reconstructAssets(assets->id).absolutePath();
token_mapping["user_properties"] = session->serializeUserProperties();
token_mapping["user_type"] = session->user_type;
// 1.7.3+ assets tokens
token_mapping["assets_root"] = absAssetsDir;
- token_mapping["assets_index_name"] = m_profile->getMinecraftAssets();
+ token_mapping["assets_index_name"] = assets->id;
QStringList parts = args_pattern.split(' ', QString::SkipEmptyParts);
for (int i = 0; i < parts.length(); i++)