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

NOISSUE change behaviour of the +tweakers patch item

Browse Source 
Patch application will either add tweakers, or move them
to the end if they are already present.

This allows fixing up tweaker order in subsequent version patches.
This commit is contained in:
Petr Mrázek 2017-10-08 02:02:52 +02:00
parent b88206907e
commit eba8e61ce9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/logic/minecraft/MinecraftProfile.cpp
View File

@ -428,12 +428,19 @@ void MinecraftProfile::applyTraits(const QSet<QString>& traits)
void MinecraftProfile::applyTweakers(const QStringList& tweakers) void MinecraftProfile::applyTweakers(const QStringList& tweakers)
{ {
// FIXME: check for dupes? // if the applied tweakers override an existing one, skip it. this effectively moves it later in the sequence
// FIXME: does order matter? QStringList newTweakers;
for (auto tweaker : tweakers) for(auto & tweaker: m_tweakers)
{ {
this->m_tweakers += tweaker; if (tweakers.contains(tweaker))
{
continue;
} }
newTweakers.append(tweaker);
}
// then just append the new tweakers (or moved original ones)
newTweakers += tweakers;
m_tweakers = newTweakers;
} }
void MinecraftProfile::applyJarMods(const QList<LibraryPtr>& jarMods) void MinecraftProfile::applyJarMods(const QList<LibraryPtr>& jarMods)