diff --git a/LaunchServer/source/LaunchServer.java b/LaunchServer/source/LaunchServer.java index 2a3a5a5..587be6a 100644 --- a/LaunchServer/source/LaunchServer.java +++ b/LaunchServer/source/LaunchServer.java @@ -114,7 +114,6 @@ // Setup reloadKeyPair(); reloadConfig(); - hashLauncherBinaries(); // Hash updates dir if (!IOHelper.isDir(UPDATES_DIR)) { @@ -302,7 +301,7 @@ } newConfig.verify(); - // Flush old config providers + // Flush old auth handler and provider if (oldConfig != null) { // Flush auth handler try { @@ -321,7 +320,8 @@ // Apply changes config = newConfig; - launcherEXEBinary = newConfig.launch4J ? new EXEL4JLauncherBinary(this) : new EXELauncherBinary(this); + launcherEXEBinary = newConfig.launch4J ? + new EXEL4JLauncherBinary(this) : new EXELauncherBinary(this); } @LauncherAPI diff --git a/LaunchServer/source/binary/EXEL4JLauncherBinary.java b/LaunchServer/source/binary/EXEL4JLauncherBinary.java index d4dbc00..3fdbea2 100644 --- a/LaunchServer/source/binary/EXEL4JLauncherBinary.java +++ b/LaunchServer/source/binary/EXEL4JLauncherBinary.java @@ -23,7 +23,7 @@ private static final Path FAVICON_FILE = IOHelper.WORKING_DIR.resolve("favicon.ico"); @LauncherAPI - public EXEL4JLauncherBinary(LaunchServer server) { + public EXEL4JLauncherBinary(LaunchServer server) throws IOException { super(server, EXE_BINARY_FILE); } diff --git a/LaunchServer/source/binary/EXELauncherBinary.java b/LaunchServer/source/binary/EXELauncherBinary.java index 15bc9c8..87bf7c9 100644 --- a/LaunchServer/source/binary/EXELauncherBinary.java +++ b/LaunchServer/source/binary/EXELauncherBinary.java @@ -13,7 +13,7 @@ @LauncherAPI public static final Path EXE_BINARY_FILE = IOHelper.toPath("Launcher.exe"); @LauncherAPI - public EXELauncherBinary(LaunchServer server) { + public EXELauncherBinary(LaunchServer server) throws IOException { super(server, IOHelper.WORKING_DIR.resolve(EXE_BINARY_FILE)); } diff --git a/LaunchServer/source/binary/LauncherBinary.java b/LaunchServer/source/binary/LauncherBinary.java index 0235982..f750845 100644 --- a/LaunchServer/source/binary/LauncherBinary.java +++ b/LaunchServer/source/binary/LauncherBinary.java @@ -14,9 +14,10 @@ private volatile SignedBytesHolder binary; @LauncherAPI - protected LauncherBinary(LaunchServer server, Path binaryFile) { + protected LauncherBinary(LaunchServer server, Path binaryFile) throws IOException { this.server = server; this.binaryFile = binaryFile; + hash(); } @LauncherAPI diff --git a/LaunchServer/source/command/handler/JLineCommandHandler.java b/LaunchServer/source/command/handler/JLineCommandHandler.java index 2c0c3d6..7671253 100644 --- a/LaunchServer/source/command/handler/JLineCommandHandler.java +++ b/LaunchServer/source/command/handler/JLineCommandHandler.java @@ -34,7 +34,7 @@ @Override public String readLine() throws IOException { - return reader.readLine("> "); + return reader.readLine(); } private final class JLineOutput implements LogHelper.Output {