From bc87e65ec993941e45b13e9d65a0113955fc3c80 Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 22 Mar 2019 13:19:58 +0700 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?= =?UTF-8?q?merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/gravit/launchserver/LaunchServer.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index 5c79bffd..5f374709 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -8,7 +8,6 @@ import ru.gravit.launcher.managers.GarbageManager; import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.serialize.signed.SignedObjectHolder; -import ru.gravit.launchserver.auth.AuthLimiter; import ru.gravit.launchserver.auth.AuthProviderPair; import ru.gravit.launchserver.auth.protect.NoProtectHandler; import ru.gravit.launchserver.auth.protect.ProtectHandler; @@ -118,8 +117,6 @@ public AuthProviderPair getAuthProviderPair() return null; } - public PermissionsHandler permissionsHandler; - public HWIDHandler hwidHandler; public HashMap components; @@ -188,13 +185,12 @@ public void verify() { throw new NullPointerException("AuthHandler must not be null"); } boolean isOneDefault = false; - for(AuthProviderPair pair : auth) - { - if(pair.isDefault) - { + for(AuthProviderPair pair : auth) { + if (pair.isDefault) { isOneDefault = true; break; } + } if(protectHandler == null) { throw new NullPointerException("ProtectHandler must not be null"); @@ -468,7 +464,6 @@ public LaunchServer(Path dir, String[] args) throws IOException, InvalidKeySpecE { config.protectHandler.checkLaunchServerLicense(); } - config.authHandler.init(); if(config.components != null) { LogHelper.debug("PreInit components");