From 770a9a18ce6c9d1aa338243b5230ebd9a718d415 Mon Sep 17 00:00:00 2001
From: Zaxar163 <zahar.vcherachny@yandex.ru>
Date: Fri, 10 Jan 2020 14:55:16 +0100
Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=9F=D0=BE=D1=80=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B8=D0=BA=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D1=81=20=D0=B2=D0=B5=D1=82=D0=BA=D0=B8=20hotfix?=
 =?UTF-8?q?/5.0.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profile/ProfileByUUIDResponse.java        |  4 ++
 .../launchserver/defaults/profile1.14.4.cfg   |  2 -
 .../launchserver/defaults/profile1.15.1.cfg   | 38 +++++++++++++++++++
 .../launcher/profiles/ClientProfile.java      |  3 +-
 4 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg

diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java
index 72365891..ee5d9d7c 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java
@@ -60,6 +60,10 @@ public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
             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)));
     }
 }
diff --git a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg
index e5ca1b4b..0fac6e8b 100644
--- a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg
+++ b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.14.4.cfg
@@ -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",
diff --git a/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg
new file mode 100644
index 00000000..f265344f
--- /dev/null
+++ b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.15.1.cfg
@@ -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": []
+}
\ No newline at end of file
diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
index 2f3b7b6b..10a25fa2 100644
--- a/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
+++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
@@ -40,7 +40,8 @@ public enum Version {
         MC1142("1.14.2", 485),
         MC1143("1.14.3", 490),
         MC1144("1.14.4", 498),
-        MC115("1.15", 573);
+        MC115("1.15", 573),
+        MC1151("1.15.1", 575);
         private static final Map<String, Version> VERSIONS;
 
         static {