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] Ошибки merge

Browse source
This commit is contained in:
Gravit 2019-03-22 13:19:58 +07:00
parent c562f48384
commit bc87e65ec9
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -8,7 +8,6 @@
import ru.gravit.launcher.managers.GarbageManager; import ru.gravit.launcher.managers.GarbageManager;
import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launcher.serialize.signed.SignedObjectHolder; import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
import ru.gravit.launchserver.auth.AuthLimiter;
import ru.gravit.launchserver.auth.AuthProviderPair; import ru.gravit.launchserver.auth.AuthProviderPair;
import ru.gravit.launchserver.auth.protect.NoProtectHandler; import ru.gravit.launchserver.auth.protect.NoProtectHandler;
import ru.gravit.launchserver.auth.protect.ProtectHandler; import ru.gravit.launchserver.auth.protect.ProtectHandler;
@ -118,8 +117,6 @@ public AuthProviderPair getAuthProviderPair()
return null; return null;
} }
public PermissionsHandler permissionsHandler;
public HWIDHandler hwidHandler; public HWIDHandler hwidHandler;
public HashMap<String, Component> components; public HashMap<String, Component> components;
@ -188,13 +185,12 @@ public void verify() {
throw new NullPointerException("AuthHandler must not be null"); throw new NullPointerException("AuthHandler must not be null");
} }
boolean isOneDefault = false; boolean isOneDefault = false;
for(AuthProviderPair pair : auth) for(AuthProviderPair pair : auth) {
{ if (pair.isDefault) {
if(pair.isDefault)
{
isOneDefault = true; isOneDefault = true;
break; break;
} }
}
if(protectHandler == null) if(protectHandler == null)
{ {
throw new NullPointerException("ProtectHandler must not be 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.protectHandler.checkLaunchServerLicense();
} }
config.authHandler.init();
if(config.components != null) if(config.components != null)
{ {
LogHelper.debug("PreInit components"); LogHelper.debug("PreInit components");