0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installing forge after liteloader and then removing liteloader. Also formatting.

Browse Source
This commit is contained in:
Jan Dalheimer
2014-02-02 14:17:44 +01:00
parent ece826bdbc
commit cdd35910c3
8 changed files with 96 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/ForgeInstaller.cpp
View File

@@ -151,7 +151,7 @@ bool ForgeInstaller::add(OneSixInstance *to)
bool found = false;
bool equals = false;
// find an entry that matches this one
for (auto tolib : to->getNonCustomVersion()->libraries)
for (auto tolib : to->getVanillaVersion()->libraries)
{
if (tolib->name() != libName)
continue;
@@ -194,7 +194,7 @@ bool ForgeInstaller::add(OneSixInstance *to)
match = expression.match(args);
}
}
if (!args.isEmpty() && args != to->getNonCustomVersion()->minecraftArguments)
if (!args.isEmpty() && args != to->getVanillaVersion()->minecraftArguments)
{
obj.insert("minecraftArguments", args);
}
@@ -203,7 +203,7 @@ bool ForgeInstaller::add(OneSixInstance *to)
obj.insert("+tweakers", QJsonArray::fromStringList(tweakers));
}
if (!m_forge_version->processArguments.isEmpty() &&
m_forge_version->processArguments != to->getNonCustomVersion()->processArguments)
m_forge_version->processArguments != to->getVanillaVersion()->processArguments)
{
obj.insert("processArguments", m_forge_version->processArguments);
}