Merge branch 'master' into feature/1.21.20

core/src/main/java/org/geysermc/geyser/GeyserImpl.java

@@ -156,12 +156,6 @@ public class GeyserImpl implements GeyserApi, EventRegistrar {
 
     private final SessionManager sessionManager = new SessionManager();
 
-    /**
-     * This is used in GeyserConnect to stop the bedrock server binding to a port
-     */
-    @Setter
-    private static boolean shouldStartListener = true;
-
     private FloodgateCipher cipher;
     private FloodgateSkinUploader skinUploader;
     private NewsHandler newsHandler;
@@ -435,7 +429,6 @@ public class GeyserImpl implements GeyserApi, EventRegistrar {
             bedrockThreadCount = Math.max(1, SystemPropertyUtil.getInt("io.netty.eventLoopThreads", NettyRuntime.availableProcessors() * 2));
         }
 
-        if (shouldStartListener) {
         this.geyserServer = new GeyserServer(this, bedrockThreadCount);
         this.geyserServer.bind(new InetSocketAddress(config.getBedrock().address(), config.getBedrock().port()))
             .whenComplete((avoid, throwable) -> {
@@ -452,7 +445,6 @@ public class GeyserImpl implements GeyserApi, EventRegistrar {
                     }
                 }
             }).join();
-        }
 
         if (config.getRemote().authType() == AuthType.FLOODGATE) {
             try {

core/src/main/java/org/geysermc/geyser/text/GeyserLocale.java

@@ -150,7 +150,7 @@ public class GeyserLocale {
         } else {
             if (!validLocalLanguage) {
                 // Don't warn on missing locales if a local file has been found
-                bootstrap.getGeyserLogger().warning("Missing locale: " + locale);
+                bootstrap.getGeyserLogger().debug("Missing locale: " + locale);
             }
         }