From 34cceb614e65d0b0bd3dea5734c78d9c036b5909 Mon Sep 17 00:00:00 2001 From: Konicai <71294714+konicai@users.noreply.github.com> Date: Fri, 29 Sep 2023 14:08:49 -0400 Subject: [PATCH 1/2] Suppress address in bind log statement if it is 0.0.0.0 --- .../main/java/org/geysermc/geyser/GeyserImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java index d13836e9a..cbeab7a22 100644 --- a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java +++ b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java @@ -361,13 +361,17 @@ public class GeyserImpl implements GeyserApi { this.geyserServer = new GeyserServer(this, bedrockThreadCount); this.geyserServer.bind(new InetSocketAddress(config.getBedrock().address(), config.getBedrock().port())) .whenComplete((avoid, throwable) -> { + String address = config.getBedrock().address(); + String port = String.valueOf(config.getBedrock().port()); + if (throwable == null) { - logger.info(GeyserLocale.getLocaleStringLog("geyser.core.start", config.getBedrock().address(), - String.valueOf(config.getBedrock().port()))); + if ("0.0.0.0".equals(address)) { + // basically just hide it in the log because some people get confused and try to change it + address = ""; + } + logger.info(GeyserLocale.getLocaleStringLog("geyser.core.start", address, port)); } else { - String address = config.getBedrock().address(); - int port = config.getBedrock().port(); - logger.severe(GeyserLocale.getLocaleStringLog("geyser.core.fail", address, String.valueOf(port))); + logger.severe(GeyserLocale.getLocaleStringLog("geyser.core.fail", address, port)); if (!"0.0.0.0".equals(address)) { logger.info(Component.text("Suggestion: try setting `address` under `bedrock` in the Geyser config back to 0.0.0.0", NamedTextColor.GREEN)); logger.info(Component.text("Then, restart this server.", NamedTextColor.GREEN)); From 85a714ba5ab5e47bf08423230f372722ae88787b Mon Sep 17 00:00:00 2001 From: Konicai <71294714+konicai@users.noreply.github.com> Date: Fri, 29 Sep 2023 14:10:23 -0400 Subject: [PATCH 2/2] Forgotten comment --- core/src/main/java/org/geysermc/geyser/GeyserImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java index cbeab7a22..782f77560 100644 --- a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java +++ b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java @@ -362,7 +362,7 @@ public class GeyserImpl implements GeyserApi { this.geyserServer.bind(new InetSocketAddress(config.getBedrock().address(), config.getBedrock().port())) .whenComplete((avoid, throwable) -> { String address = config.getBedrock().address(); - String port = String.valueOf(config.getBedrock().port()); + String port = String.valueOf(config.getBedrock().port()); // otherwise we get commas if (throwable == null) { if ("0.0.0.0".equals(address)) {