diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-07 20:18:56 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-07 20:18:56 +0300 |
| commit | bbd9e4de9b29e7cb58c7ec4e8a827fec59a8fb55 (patch) | |
| tree | 855c32369f09dfa992b45eb4b3ded17cd97e140d /launcher/minecraft/OneSixVersionFormat.cpp | |
| parent | 1e702ee40f211286f85fa5353704e358e7fe14a9 (diff) | |
| parent | 9b9d439fce9408712a594bb294e3bd5f108e31bc (diff) | |
| download | PrismLauncher-bbd9e4de9b29e7cb58c7ec4e8a827fec59a8fb55.tar.gz PrismLauncher-bbd9e4de9b29e7cb58c7ec4e8a827fec59a8fb55.tar.bz2 PrismLauncher-bbd9e4de9b29e7cb58c7ec4e8a827fec59a8fb55.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
Diffstat (limited to 'launcher/minecraft/OneSixVersionFormat.cpp')
| -rw-r--r-- | launcher/minecraft/OneSixVersionFormat.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/launcher/minecraft/OneSixVersionFormat.cpp b/launcher/minecraft/OneSixVersionFormat.cpp index 888b6860..b586198b 100644 --- a/launcher/minecraft/OneSixVersionFormat.cpp +++ b/launcher/minecraft/OneSixVersionFormat.cpp @@ -276,7 +276,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc if (root.contains("requires")) { - Meta::parseRequires(root, &out->requires); + Meta::parseRequires(root, &out->m_requires); } QString dependsOnMinecraftVersion = root.value("mcVersion").toString(); if(!dependsOnMinecraftVersion.isEmpty()) @@ -284,9 +284,9 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc Meta::Require mcReq; mcReq.uid = "net.minecraft"; mcReq.equalsVersion = dependsOnMinecraftVersion; - if (out->requires.count(mcReq) == 0) + if (out->m_requires.count(mcReq) == 0) { - out->requires.insert(mcReq); + out->m_requires.insert(mcReq); } } if (root.contains("conflicts")) @@ -392,9 +392,9 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr &patch } root.insert("mods", array); } - if(!patch->requires.empty()) + if(!patch->m_requires.empty()) { - Meta::serializeRequires(root, &patch->requires, "requires"); + Meta::serializeRequires(root, &patch->m_requires, "requires"); } if(!patch->conflicts.empty()) { |