summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-02-28 20:37:51 +0100
committerPetr Mrázek <peterix@gmail.com>2017-02-28 20:37:51 +0100
commit01cb5ebb35fbcace104ba28cdb517ff256258b85 (patch)
treec25a979f75663f7cdff698e32e2be60dd341cce9 /api/logic/minecraft
parentaafac3934b9887ced77c9f5b3d6be988af06dbf0 (diff)
downloadMultiMC-01cb5ebb35fbcace104ba28cdb517ff256258b85.tar
MultiMC-01cb5ebb35fbcace104ba28cdb517ff256258b85.tar.gz
MultiMC-01cb5ebb35fbcace104ba28cdb517ff256258b85.tar.lz
MultiMC-01cb5ebb35fbcace104ba28cdb517ff256258b85.tar.xz
MultiMC-01cb5ebb35fbcace104ba28cdb517ff256258b85.zip
GH-1828 do not load assets info from custom version files
Fixes issue where this causes the launcher to use the old assets URL
Diffstat (limited to 'api/logic/minecraft')
-rw-r--r--api/logic/minecraft/onesix/OneSixProfileStrategy.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
index af42286d..07c9f075 100644
--- a/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
+++ b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
@@ -170,6 +170,12 @@ void OneSixProfileStrategy::loadUserPatches()
}
file->setRemovable(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);
}
// now load the rest by internal preference.
@@ -192,6 +198,12 @@ void OneSixProfileStrategy::loadUserPatches()
continue;
file->setRemovable(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);
}
QSet<int> seen;