From e440fcb6e3db2b40bd57f3caa52c6f32b9326935 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Sun, 7 Apr 2019 08:46:34 +0300 Subject: [PATCH] =?UTF-8?q?[FIX]=20Perms=20handler=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/gravit/launchserver/LaunchServer.java | 4 +++- LauncherTest/permissions.json | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 LauncherTest/permissions.json diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index 1a635ee5..0e547f35 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -15,6 +15,7 @@ import ru.gravit.launchserver.auth.handler.MemoryAuthHandler; import ru.gravit.launchserver.auth.hwid.AcceptHWIDHandler; import ru.gravit.launchserver.auth.hwid.HWIDHandler; +import ru.gravit.launchserver.auth.permissions.DefaultPermissionsHandler; import ru.gravit.launchserver.auth.permissions.JsonFilePermissionsHandler; import ru.gravit.launchserver.auth.permissions.PermissionsHandler; import ru.gravit.launchserver.auth.protect.NoProtectHandler; @@ -662,7 +663,8 @@ private void generateConfigIfNotExists(boolean testEnv) throws IOException { new RequestTextureProvider("http://example.com/skins/%username%.png", "http://example.com/cloaks/%username%.png") , "std")}; newConfig.protectHandler = new NoProtectHandler(); - newConfig.permissionsHandler = new JsonFilePermissionsHandler(); + if (testEnv) newConfig.permissionsHandler = new DefaultPermissionsHandler(); + else newConfig.permissionsHandler = new JsonFilePermissionsHandler(); newConfig.legacyPort = 7240; newConfig.legacyBindAddress = "0.0.0.0"; newConfig.binaryName = "Launcher"; diff --git a/LauncherTest/permissions.json b/LauncherTest/permissions.json deleted file mode 100644 index 9e26dfee..00000000 --- a/LauncherTest/permissions.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file