From 1761aeb9775ac606d7f495f559977495e7baa9ee Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Tue, 26 Aug 2025 17:51:48 +0200
Subject: [PATCH] Some minor touchups

---
 core/src/main/java/org/geysermc/geyser/Constants.java     | 1 -
 core/src/main/java/org/geysermc/geyser/GeyserImpl.java    | 8 +++++++-
 .../org/geysermc/geyser/configuration/GeyserConfig.java   | 1 +
 .../geyser/scoreboard/network/util/GeyserMockContext.java | 1 -
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/Constants.java b/core/src/main/java/org/geysermc/geyser/Constants.java
index 2485cf04d..5c664b237 100644
--- a/core/src/main/java/org/geysermc/geyser/Constants.java
+++ b/core/src/main/java/org/geysermc/geyser/Constants.java
@@ -43,7 +43,6 @@ public final class Constants {
     public static final String MINECRAFT_SKIN_SERVER_URL = "https://textures.minecraft.net/texture/";
 
     public static final int CONFIG_VERSION = 5;
-    public static final int ADVANCED_CONFIG_VERSION = 1;
 
     public static final int BSTATS_ID = 5273;
 
diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
index fc2130020..dd88cb40b 100644
--- a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
+++ b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
@@ -214,7 +214,13 @@ public class GeyserImpl implements GeyserApi, EventRegistrar {
 
     public void initialize() {
         // Setup encryption early so we don't start if we can't auth
-        EncryptionUtils.getMojangPublicKey();
+        if (!config().disableXboxAuth()) {
+            try {
+                EncryptionUtils.getMojangPublicKey();
+            } catch (Throwable t) {
+                GeyserImpl.getInstance().getLogger().error("Unable to set up encryption! This can be caused by your internet connection or the Minecraft api being unreachable. ", t);
+            }
+        }
 
         long startupTime = System.currentTimeMillis();
 
diff --git a/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java
index 161b1b8f8..f47576f48 100644
--- a/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java
+++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserConfig.java
@@ -380,6 +380,7 @@ public interface GeyserConfig {
         This option specifies the amount of network threads in the Bedrock network event loop group.
         When set to -1, this count will be automatically determined based on the amount of available processors.""")
     @DefaultNumeric(-1)
+    @NumericRange(from = -1, to = 100)
     int bedrockNetworkThreadCount();
 
     @Comment("""
diff --git a/core/src/test/java/org/geysermc/geyser/scoreboard/network/util/GeyserMockContext.java b/core/src/test/java/org/geysermc/geyser/scoreboard/network/util/GeyserMockContext.java
index e1834f6e4..f7f04a9f9 100644
--- a/core/src/test/java/org/geysermc/geyser/scoreboard/network/util/GeyserMockContext.java
+++ b/core/src/test/java/org/geysermc/geyser/scoreboard/network/util/GeyserMockContext.java
@@ -27,7 +27,6 @@ package org.geysermc.geyser.scoreboard.network.util;
 
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
 import org.geysermc.geyser.GeyserImpl;
-import org.geysermc.geyser.configuration.AdvancedConfig;
 import org.geysermc.geyser.configuration.GeyserConfig;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;