mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2025-08-03 19:37:45 -04:00
ensure that both cape and skin are downloaded via https
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
parent
b90cda5eef
commit
597309ceeb
@ -180,6 +180,7 @@ MinecraftProfile profileFromJSONV3(const QJsonObject& parent, const char* tokenN
|
|||||||
}
|
}
|
||||||
out.skin.id = idV.toString();
|
out.skin.id = idV.toString();
|
||||||
out.skin.url = urlV.toString();
|
out.skin.url = urlV.toString();
|
||||||
|
out.skin.url.replace("http://textures.minecraft.net", "https://textures.minecraft.net");
|
||||||
out.skin.variant = variantV.toString();
|
out.skin.variant = variantV.toString();
|
||||||
|
|
||||||
// data for skin is optional
|
// data for skin is optional
|
||||||
@ -216,6 +217,7 @@ MinecraftProfile profileFromJSONV3(const QJsonObject& parent, const char* tokenN
|
|||||||
Cape cape;
|
Cape cape;
|
||||||
cape.id = idV.toString();
|
cape.id = idV.toString();
|
||||||
cape.url = urlV.toString();
|
cape.url = urlV.toString();
|
||||||
|
cape.url.replace("http://textures.minecraft.net", "https://textures.minecraft.net");
|
||||||
cape.alias = aliasV.toString();
|
cape.alias = aliasV.toString();
|
||||||
|
|
||||||
// data for cape is optional.
|
// data for cape is optional.
|
||||||
|
@ -207,6 +207,7 @@ bool parseMinecraftProfile(QByteArray& data, MinecraftProfile& output)
|
|||||||
if (!getString(capeObj.value("url"), capeOut.url)) {
|
if (!getString(capeObj.value("url"), capeOut.url)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
capeOut.url.replace("http://textures.minecraft.net", "https://textures.minecraft.net");
|
||||||
if (!getString(capeObj.value("alias"), capeOut.alias)) {
|
if (!getString(capeObj.value("alias"), capeOut.alias)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -358,6 +359,7 @@ bool parseMinecraftProfileMojang(QByteArray& data, MinecraftProfile& output)
|
|||||||
qWarning() << "Skin url is not a string";
|
qWarning() << "Skin url is not a string";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
skinOut.url.replace("http://textures.minecraft.net", "https://textures.minecraft.net");
|
||||||
|
|
||||||
auto maybeMeta = skin.find("metadata");
|
auto maybeMeta = skin.find("metadata");
|
||||||
if (maybeMeta != skin.end() && maybeMeta->isObject()) {
|
if (maybeMeta != skin.end() && maybeMeta->isObject()) {
|
||||||
@ -371,6 +373,7 @@ bool parseMinecraftProfileMojang(QByteArray& data, MinecraftProfile& output)
|
|||||||
qWarning() << "Cape url is not a string";
|
qWarning() << "Cape url is not a string";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
capeOut.url.replace("http://textures.minecraft.net", "https://textures.minecraft.net");
|
||||||
|
|
||||||
// we don't know the cape ID as it is not returned from the session server
|
// we don't know the cape ID as it is not returned from the session server
|
||||||
// so just fake it - changing capes is probably locked anyway :(
|
// so just fake it - changing capes is probably locked anyway :(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user