CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-2026 implement changes necessary to support 1.13 snapshots

Browse Source
This commit is contained in:
Petr Mrázek
2017-11-11 01:38:31 +01:00
parent 17c8f31a09
commit 85ae710d40
51 changed files with 2632 additions and 1058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/logic/meta/Version.cpp
View File

@ -74,12 +74,20 @@ void Meta::Version::merge(const std::shared_ptr<BaseEntity> &other)
}
if (m_requires != version->m_requires)
{
setRequires(version->m_requires);
m_requires = version->m_requires;
}
if (m_conflicts != version->m_conflicts)
{
m_conflicts = version->m_conflicts;
}
if (m_parentUid != version->m_parentUid)
{
setParentUid(version->m_parentUid);
}
if(m_volatile != version->m_volatile)
{
setVolatile(version->m_volatile);
}
if(version->m_data)
{
setData(version->m_data);
@ -109,12 +117,19 @@ void Meta::Version::setTime(const qint64 time)
emit timeChanged();
}
void Meta::Version::setRequires(const QHash<QString, QString> &requires)
void Meta::Version::setRequires(const Meta::RequireSet &requires, const Meta::RequireSet &conflicts)
{
m_requires = requires;
m_conflicts = conflicts;
emit requiresChanged();
}
void Meta::Version::setVolatile(bool volatile_)
{
m_volatile = volatile_;
}
void Meta::Version::setData(const VersionFilePtr &data)
{
m_data = data;