diff --git a/LaunchServer/source/response/ResponseThread.java b/LaunchServer/source/response/ResponseThread.java index 077987f..8d0a744 100644 --- a/LaunchServer/source/response/ResponseThread.java +++ b/LaunchServer/source/response/ResponseThread.java @@ -48,8 +48,7 @@ Exception savedError = null; // Process connection - LogHelper.debug("Connection #%d from %s", id, - IOHelper.getIP(socket.getRemoteSocketAddress())); + LogHelper.debug("Connection #%d from %s", id, IOHelper.getIP(socket.getRemoteSocketAddress())); try (HInput input = new HInput(socket.getInputStream()); HOutput output = new HOutput(socket.getOutputStream())) { Request.Type type = readHandshake(input, output); diff --git a/LaunchServer/source/response/auth/AuthResponse.java b/LaunchServer/source/response/auth/AuthResponse.java index 9f51728..dc31b0f 100644 --- a/LaunchServer/source/response/auth/AuthResponse.java +++ b/LaunchServer/source/response/auth/AuthResponse.java @@ -42,7 +42,7 @@ try { username = server.config.authProvider.auth(login, password); if (!VerifyHelper.isValidUsername(username)) { - throw new RequestException(String.format("Illegal username: '%s'", username)); + throw new AuthException(String.format("Illegal username: '%s'", username)); } } catch (AuthException e) { throw new RequestException(e); diff --git a/Launcher/source/request/CustomRequest.java b/Launcher/source/request/CustomRequest.java index d7a7391..8971b54 100644 --- a/Launcher/source/request/CustomRequest.java +++ b/Launcher/source/request/CustomRequest.java @@ -1,15 +1,18 @@ package launcher.request; import launcher.Launcher; +import launcher.LauncherAPI; import launcher.helper.VerifyHelper; import launcher.serialize.HInput; import launcher.serialize.HOutput; public abstract class CustomRequest extends Request { + @LauncherAPI public CustomRequest(Launcher.Config config) { super(config); } + @LauncherAPI public CustomRequest() { this(null); } @@ -28,7 +31,9 @@ return requestDoCustom(input, output); } + @LauncherAPI public abstract String getName(); + @LauncherAPI protected abstract T requestDoCustom(HInput input, HOutput output); }