diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java index 1fe39c8f..6db964b0 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java @@ -575,7 +575,8 @@ public LaunchServer(Path dir, boolean testEnv, String[] args) throws IOException } config.permissionsHandler.init(this); config.hwidHandler.init(); - config.dao.init(this); + if(config.dao != null) + config.dao.init(this); if (config.protectHandler != null) { config.protectHandler.checkLaunchServerLicense(); } diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java index 31a7d451..739d4eda 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java @@ -27,5 +27,5 @@ public RegContext(String login, String password, String ip, boolean trustContext this.trustContext = trustContext; } } - public HookSet registraion; + public HookSet registraion = new HookSet<>(); } diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java index a94b870f..41d1dc7b 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java @@ -44,7 +44,7 @@ @SuppressWarnings("rawtypes") public class WebSocketService { public final ChannelGroup channels; - public static ProviderMap providers; + public static ProviderMap providers = new ProviderMap<>(); public WebSocketService(ChannelGroup channels, LaunchServer server) { this.channels = channels;