diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java index c4c8b3a4..3dd22fcd 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java @@ -103,7 +103,7 @@ public static void main(String... args) throws Throwable { gsonBuiler.setPrettyPrinting(); gson = gsonBuiler.create(); initGson(); - if(args.length > 0 && args[0].equals("setup")) + if(args.length > 0 && args[0].equals("setup") && !disableSetup) { generateConfigIfNotExists(); LogHelper.debug("Read ServerWrapperConfig.json"); diff --git a/libLauncher/src/main/java/ru/gravit/launcher/ClientPermissions.java b/libLauncher/src/main/java/ru/gravit/launcher/ClientPermissions.java index c13828a6..75957772 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/ClientPermissions.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/ClientPermissions.java @@ -8,25 +8,20 @@ public class ClientPermissions { public static final ClientPermissions DEFAULT = new ClientPermissions(); @LauncherAPI - public boolean canAdmin = false; + public boolean canAdmin; @LauncherAPI - public boolean canServer = false; + public boolean canServer; @LauncherAPI - public boolean canUSR1 = false; + public boolean canUSR1; @LauncherAPI - public boolean canUSR2 = false; + public boolean canUSR2; @LauncherAPI - public boolean canUSR3 = false; + public boolean canUSR3; @LauncherAPI - public boolean canBot = false; + public boolean canBot; public ClientPermissions(HInput input) throws IOException { - canAdmin = input.readBoolean(); - canServer = input.readBoolean(); - canUSR1 = input.readBoolean(); - canUSR2 = input.readBoolean(); - canUSR3 = input.readBoolean(); - canBot = input.readBoolean(); + this(input.readLong()); } public ClientPermissions() { @@ -67,11 +62,6 @@ public static ClientPermissions getSuperuserAccount() { } public void write(HOutput output) throws IOException { - output.writeBoolean(canAdmin); - output.writeBoolean(canServer); - output.writeBoolean(canUSR1); - output.writeBoolean(canUSR2); - output.writeBoolean(canUSR3); - output.writeBoolean(canBot); + output.writeLong(toLong()); } }