Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-01 14:04:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] NPE in ClientLauncherEntryPoint

Browse source
This commit is contained in:
Gravita 2021-06-09 10:01:07 +07:00
parent 8ad6f7ccbe
commit 32a4729970
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java
View file

@ -40,15 +40,15 @@ public class MySQLCoreProvider extends AuthCoreProvider implements AuthSupportHa
public String tableHWID = "hwids"; public String tableHWID = "hwids";
public String tableHWIDLog = "hwidLog"; public String tableHWIDLog = "hwidLog";
private String sqlFindHardwareByPublicKey; private transient String sqlFindHardwareByPublicKey;
private String sqlFindHardwareByData; private transient String sqlFindHardwareByData;
private String sqlFindHardwareById; private transient String sqlFindHardwareById;
private String sqlCreateHardware; private transient String sqlCreateHardware;
private String sqlCreateHWIDLog; private transient String sqlCreateHWIDLog;
private String sqlUpdateHardwarePublicKey; private transient String sqlUpdateHardwarePublicKey;
private String sqlUpdateHardwareBanned; private transient String sqlUpdateHardwareBanned;
private String sqlUpdateUsers; private transient String sqlUpdateUsers;
private String sqlUsersByHwidId; private transient String sqlUsersByHwidId;
public PasswordVerifier passwordVerifier; public PasswordVerifier passwordVerifier;
public double criticalCompareLevel = 1.0; public double criticalCompareLevel = 1.0;

2
Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java
View file

@ -101,7 +101,6 @@ public static void main(String[] args) throws Throwable {
LogHelper.info("Using Sessions"); LogHelper.info("Using Sessions");
Request.setSession(params.session); Request.setSession(params.session);
} }
Request.service.registerEventHandler(new BasicLauncherEventHandler());
checkJVMBitsAndVersion(params.profile.getMinJavaVersion(), params.profile.getRecommendJavaVersion(), params.profile.getMaxJavaVersion(), params.profile.isWarnMissJavaVersion()); checkJVMBitsAndVersion(params.profile.getMinJavaVersion(), params.profile.getRecommendJavaVersion(), params.profile.getMaxJavaVersion(), params.profile.isWarnMissJavaVersion());
LauncherEngine.modulesManager.invokeEvent(new ClientProcessInitPhase(engine, params)); LauncherEngine.modulesManager.invokeEvent(new ClientProcessInitPhase(engine, params));
@ -121,6 +120,7 @@ public static void main(String[] args) throws Throwable {
boolean digest = !profile.isUpdateFastCheck(); boolean digest = !profile.isUpdateFastCheck();
LogHelper.debug("Restore sessions"); LogHelper.debug("Restore sessions");
Request.restore(); Request.restore();
Request.service.registerEventHandler(new BasicLauncherEventHandler());
Request.service.reconnectCallback = () -> Request.service.reconnectCallback = () ->
{ {
LogHelper.debug("WebSocket connect closed. Try reconnect"); LogHelper.debug("WebSocket connect closed. Try reconnect");