mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-06 05:16:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Backport release-10.x] Make Minecraft resource URL override consistent with other overrides (#4877)

Browse source
This commit is contained in:
Alexandru Ionut Tripon 2026-02-17 21:01:49 +02:00 • committed by GitHub
commit a9a15a20ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
launcher/minecraft/update/AssetUpdateTask.cpp
View file

@ -73,7 +73,7 @@ void AssetUpdateTask::assetIndexFinished()
auto job = index.getDownloadJob();
if (job) {
QString resourceURL = APPLICATION->settings()->get("ResourceURL").toString();
QString resourceURL = resourceUrl();
QString source = tr("Mojang");
if (resourceURL != BuildConfig.DEFAULT_RESOURCE_BASE) {
source = QUrl(resourceURL).host();
@ -111,3 +111,12 @@ bool AssetUpdateTask::abort()
}
return true;
}
QString AssetUpdateTask::resourceUrl()
{
if (const QString urlOverride = APPLICATION->settings()->get("ResourceURLOverride").toString(); !urlOverride.isEmpty()) {
return urlOverride;
}
return BuildConfig.DEFAULT_RESOURCE_BASE;
}