diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-14 01:18:54 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-14 01:18:54 +0100 |
| commit | bbd17b6224ea1cbccbe602a123b828b20ec5619f (patch) | |
| tree | 317a73a487402deaadba6cf3a8941e72242d7b66 /logic/OneSixInstance.cpp | |
| parent | 1e96a0c8eba2d932e08a33ec909cf8141f1aaa43 (diff) | |
| download | MultiMC-bbd17b6224ea1cbccbe602a123b828b20ec5619f.tar MultiMC-bbd17b6224ea1cbccbe602a123b828b20ec5619f.tar.gz MultiMC-bbd17b6224ea1cbccbe602a123b828b20ec5619f.tar.lz MultiMC-bbd17b6224ea1cbccbe602a123b828b20ec5619f.tar.xz MultiMC-bbd17b6224ea1cbccbe602a123b828b20ec5619f.zip | |
Fix twitch
Diffstat (limited to 'logic/OneSixInstance.cpp')
| -rw-r--r-- | logic/OneSixInstance.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 337830a2..fd41b9e5 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -152,8 +152,17 @@ QStringList OneSixInstance::processMinecraftArgs(MojangAccountPtr account) token_mapping["game_directory"] = absRootDir; QString absAssetsDir = QDir("assets/").absolutePath(); token_mapping["game_assets"] = reconstructAssets(d->version).absolutePath(); - //TODO: this is something new and not even fully implemented in the vanilla launcher. - token_mapping["user_properties"] = "{ }"; + + auto user = account->user(); + QJsonObject userAttrs; + for(auto key: user.properties.keys()) + { + auto array = QJsonArray::fromStringList(user.properties.values(key)); + userAttrs.insert(key, array); + } + QJsonDocument value(userAttrs); + + token_mapping["user_properties"] = value.toJson(QJsonDocument::Compact); token_mapping["user_type"] = account->currentProfile()->legacy ? "legacy" : "mojang"; // 1.7.3+ assets tokens token_mapping["assets_root"] = absAssetsDir; |