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

Merge branch 'hotfix/5.0.11' of github.com:GravitLauncher/Launcher into hotfix/5.0.11

Browse source
This commit is contained in:
Gravit 2020-01-18 14:15:42 +07:00
commit dcd2888f91
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
4 changed files with 46 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java
View file

@ -55,12 +55,15 @@ public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
} else {
pair = client.auth;
}
if(pair == null)
{
if (pair == null) {
sendError("ProfileByUUIDResponse: AuthProviderPair is null");
return;
}
username = pair.handler.uuidToUsername(uuid);
if (username == null) {
sendError(String.format("ProfileByUUIDResponse: User with uuid %s not found or AuthProvider#uuidToUsername returned null", uuid));
return;
}
sendResult(new ProfileByUUIDRequestEvent(getProfile(uuid, username, this.client, client.auth.textureProvider)));
}
}

2
LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg
View file

@ -23,8 +23,6 @@
"useWhitelist": false,
"mainClass": "net.minecraft.client.main.Main",
"jvmArgs": [
"-Dfml.ignorePatchDiscrepancies=true",
"-Dfml.ignoreInvalidMinecraftCertificates=rue",
"-XX:+UseConcMarkSweepGC",
"-XX:+CMSIncrementalMode",
"-XX:-UseAdaptiveSizePolicy",

38
LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg Normal file
View file

@ -0,0 +1,38 @@
{
"version": "1.15.1",
"assetIndex": "1.15.1",
"assetDir": "asset1.15.1",
"dir": "HiTech",
"info": "Информация о сервере",
"sortIndex": 0,
"title": "xxxxxxxx",
"serverAddress": "localhost",
"serverPort": 25565,
"update": [
"servers.dat"
],
"updateExclusions": [],
"updateShared": [],
"updateVerify": [
"libraries",
"natives",
"minecraft.jar"
],
"updateOptional": [],
"updateFastCheck": true,
"useWhitelist": false,
"mainClass": "net.minecraft.client.main.Main",
"jvmArgs": [
"-XX:+UseConcMarkSweepGC",
"-XX:+CMSIncrementalMode",
"-XX:-UseAdaptiveSizePolicy",
"-Xmn128M",
"-XX:+DisableAttachMechanism"
],
"classPath": [
"minecraft.jar",
"libraries"
],
"clientArgs": [],
"whitelist": []
}

4
LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
View file

@ -46,7 +46,9 @@ public enum Version {
MC1141("1.14.1", 480),
MC1142("1.14.2", 485),
MC1143("1.14.3", 490),
MC1144("1.14.4", 498);
MC1144("1.14.4", 498),
MC115("1.15", 573),
MC1151("1.15.1", 575);
private static final Map<String, Version> VERSIONS;
static {