Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 17:11:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Фикс краша клиента при использовании длинных skinURL/cloakURL или %uuid%

Browse source
This commit is contained in:
Gravit 2018-12-27 16:31:29 +07:00
parent edf6adafe0
commit 92a253eb82
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
View file

@ -2,6 +2,7 @@
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import ru.gravit.launcher.*; import ru.gravit.launcher.*;
import ru.gravit.launcher.hasher.DirWatcher; import ru.gravit.launcher.hasher.DirWatcher;
@ -168,7 +169,13 @@ public void write(HOutput output) throws IOException {
private static final Path NATIVES_DIR = IOHelper.toPath("natives"); private static final Path NATIVES_DIR = IOHelper.toPath("natives");
private static final Path RESOURCEPACKS_DIR = IOHelper.toPath("resourcepacks"); private static final Path RESOURCEPACKS_DIR = IOHelper.toPath("resourcepacks");
private static PublicURLClassLoader classLoader; private static PublicURLClassLoader classLoader;
public static class ClientUserProperties
{
String[] skinURL;
String[] skinDigest;
String[] cloakURL;
String[] cloakDigest;
}
private static void addClientArgs(Collection<String> args, ClientProfile profile, Params params) { private static void addClientArgs(Collection<String> args, ClientProfile profile, Params params) {
PlayerProfile pp = params.pp; PlayerProfile pp = params.pp;
@ -183,14 +190,14 @@ private static void addClientArgs(Collection<String> args, ClientProfile profile
if (version.compareTo(ClientProfile.Version.MC1710) >= 0) { if (version.compareTo(ClientProfile.Version.MC1710) >= 0) {
// Add user properties // Add user properties
Collections.addAll(args, "--userType", "mojang"); Collections.addAll(args, "--userType", "mojang");
JsonObject properties = new JsonObject(); ClientUserProperties properties = new ClientUserProperties();
if (pp.skin != null) { if (pp.skin != null) {
properties.addProperty(Launcher.SKIN_URL_PROPERTY, pp.skin.url); properties.skinURL = new String[]{pp.skin.url};
properties.addProperty(Launcher.SKIN_DIGEST_PROPERTY, SecurityHelper.toHex(pp.skin.digest)); properties.skinDigest = new String[]{SecurityHelper.toHex(pp.skin.digest)};
} }
if (pp.cloak != null) { if (pp.cloak != null) {
properties.addProperty(Launcher.CLOAK_URL_PROPERTY, pp.cloak.url); properties.cloakURL = new String[]{pp.cloak.url};
properties.addProperty(Launcher.CLOAK_DIGEST_PROPERTY, SecurityHelper.toHex(pp.cloak.digest)); properties.cloakDigest = new String[]{SecurityHelper.toHex(pp.cloak.digest)};
} }
Collections.addAll(args, "--userProperties", ClientLauncher.gson.toJson(properties)); Collections.addAll(args, "--userProperties", ClientLauncher.gson.toJson(properties));