diff --git a/src/main/java/eu/mhsl/craftattack/loginServer/Api.java b/src/main/java/eu/mhsl/craftattack/loginServer/Api.java index 09ce909..c021add 100644 --- a/src/main/java/eu/mhsl/craftattack/loginServer/Api.java +++ b/src/main/java/eu/mhsl/craftattack/loginServer/Api.java @@ -77,8 +77,7 @@ public final class Api { JsonElement error = json.get("error"); if (error != null && error.isJsonPrimitive()) message = error.getAsString(); } catch (RuntimeException ignored) {} - throw new SignupError(code, "Signup fehlgeschlagen (" + status + "/" + code + "): " + message - + " [username=" + username + ", uuid=" + uuid + ", edition=" + edition + "]"); + throw new SignupError(code, "Request: " + body + "\nResponse: " + response.body()); } private static HttpResponse call(String method, String path, String body, boolean withAuth) { diff --git a/src/main/java/eu/mhsl/craftattack/loginServer/Dialog.java b/src/main/java/eu/mhsl/craftattack/loginServer/Dialog.java index 2d95af6..e7bc257 100644 --- a/src/main/java/eu/mhsl/craftattack/loginServer/Dialog.java +++ b/src/main/java/eu/mhsl/craftattack/loginServer/Dialog.java @@ -149,10 +149,12 @@ public final class Dialog { for (String rule : rules) { body.add(plain(Component.text(rule), rulesWidth)); } + + boolean bedrock = PlayerHandler.isBedrockUuid(player.getUuid()); body.add(plain(Component.text() - .append(link("Datenschutzerklärung", privacyUrl)) + .append(bedrock ? Component.text(privacyUrl) : link("Datenschutzerklärung", privacyUrl)) .append(Component.text(" | ")) - .append(link("Vollständige Regeln", rulesUrl)) + .append(bedrock ? Component.text(rulesUrl) : link("Vollständige Regeln", rulesUrl)) .build(), rulesWidth)); } case privacy -> { @@ -192,7 +194,7 @@ public final class Dialog { if (state.isLastPage()) buttons.add(button("Anmeldung abschließen", finishKey)); else buttons.add(button("Weiter →", nextKey, state.isFirstPage() ? cancelWidth : buttonWidth)); if (!state.isFirstPage()) buttons.add(bedrock ? 1 : 0, button("← Zurück", backKey)); - buttons.add(button("Anmeldung abbrechen", cancelKey, cancelWidth)); + if(state.isFirstPage()) buttons.add(button("Anmeldung abbrechen", cancelKey, cancelWidth)); player.showDialog(new net.minestom.server.dialog.Dialog.MultiAction( new DialogMetadata(