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

[FIX] Исправление ошибок NPE при запуске

Browse source
This commit is contained in:
Gravit 2019-07-01 17:08:20 +07:00
parent 6db16ac0f3
commit 37b679bbd6
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java
View file

@ -575,6 +575,7 @@ public LaunchServer(Path dir, boolean testEnv, String[] args) throws IOException
} }
config.permissionsHandler.init(this); config.permissionsHandler.init(this);
config.hwidHandler.init(); config.hwidHandler.init();
if(config.dao != null)
config.dao.init(this); config.dao.init(this);
if (config.protectHandler != null) { if (config.protectHandler != null) {
config.protectHandler.checkLaunchServerLicense(); config.protectHandler.checkLaunchServerLicense();

2
LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java
View file

@ -27,5 +27,5 @@ public RegContext(String login, String password, String ip, boolean trustContext
this.trustContext = trustContext; this.trustContext = trustContext;
} }
} }
public HookSet<RegContext> registraion; public HookSet<RegContext> registraion = new HookSet<>();
} }

2
LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java
View file

@ -44,7 +44,7 @@
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public class WebSocketService { public class WebSocketService {
public final ChannelGroup channels; public final ChannelGroup channels;
public static ProviderMap<JsonResponseInterface> providers; public static ProviderMap<JsonResponseInterface> providers = new ProviderMap<>();
public WebSocketService(ChannelGroup channels, LaunchServer server) { public WebSocketService(ChannelGroup channels, LaunchServer server) {
this.channels = channels; this.channels = channels;