summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-04-14 12:33:54 +0200
committerPetr Mrázek <peterix@gmail.com>2017-04-14 12:33:54 +0200
commit07cde802e4021f6f2592f297b30a2f812dcca796 (patch)
treecb40c2ddfb27612d9ac4f61bb170df5a51f6e2d8
parent2aaf9827a67bf3de23b6b8ad9e85a42686659d1a (diff)
downloadMultiMC-07cde802e4021f6f2592f297b30a2f812dcca796.tar
MultiMC-07cde802e4021f6f2592f297b30a2f812dcca796.tar.gz
MultiMC-07cde802e4021f6f2592f297b30a2f812dcca796.tar.lz
MultiMC-07cde802e4021f6f2592f297b30a2f812dcca796.tar.xz
MultiMC-07cde802e4021f6f2592f297b30a2f812dcca796.zip
GH-1853 fix FTB and parsing of old version files
-rw-r--r--api/logic/minecraft/ftb/FTBProfileStrategy.cpp1
-rw-r--r--api/logic/minecraft/onesix/OneSixVersionFormat.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/logic/minecraft/ftb/FTBProfileStrategy.cpp b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp
index c3d9cc6a..b017277d 100644
--- a/api/logic/minecraft/ftb/FTBProfileStrategy.cpp
+++ b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp
@@ -59,6 +59,7 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches()
// adapt the loaded file - the FTB patch file format is different than ours.
file->minecraftVersion.clear();
+ file->mainJar = nullptr;
for(auto addLib: file->libraries)
{
addLib->setHint("local");
diff --git a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
index 267ad888..c404e96f 100644
--- a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
+++ b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
@@ -160,6 +160,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc
{
lib->setAbsoluteUrl(URLConstants::getLegacyJarUrl(out->minecraftVersion));
}
+ out->mainJar = lib;
}
/* removed features that shouldn't be used */