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

GH-1828 do not load assets info from custom version files

Browse Source 
Fixes issue where this causes the launcher to use the old assets URL
This commit is contained in:
Petr Mrázek
2017-02-28 20:37:51 +01:00
parent aafac3934b
commit 01cb5ebb35
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
View File

@@ -170,6 +170,12 @@ void OneSixProfileStrategy::loadUserPatches()
} }
file->setRemovable(true); file->setRemovable(true);
file->setMovable(true); file->setMovable(true);
// HACK: ignore assets from other version files than Minecraft
// workaround for stupid assets issue caused by amazon:
// https://www.theregister.co.uk/2017/02/28/aws_is_awol_as_s3_goes_haywire/
file->assets = QString();
file->mojangAssetIndex.reset();
// HACK
profile->appendPatch(file); profile->appendPatch(file);
} }
// now load the rest by internal preference. // now load the rest by internal preference.
@@ -192,6 +198,12 @@ void OneSixProfileStrategy::loadUserPatches()
continue; continue;
file->setRemovable(true); file->setRemovable(true);
file->setMovable(true); file->setMovable(true);
// HACK: ignore assets from other version files than Minecraft
// workaround for stupid assets issue caused by amazon:
// https://www.theregister.co.uk/2017/02/28/aws_is_awol_as_s3_goes_haywire/
file->assets = QString();
file->mojangAssetIndex.reset();
// HACK
files.insert(file->order, file); files.insert(file->order, file);
} }
QSet<int> seen; QSet<int> seen;