From aaa100b2d308e6b23c8fe574ac48435024de8fb5 Mon Sep 17 00:00:00 2001
From: rtm516 <rtm516@users.noreply.github.com>
Date: Sat, 5 Jun 2021 01:02:10 +0100
Subject: [PATCH] Add static variable to disable bedrock listener (#2254)

* Add static variable to disable bedrock listener

* Add default value

* Add javadoc comment
---
 .../geysermc/connector/GeyserConnector.java   | 25 +++++++++++++------
 pom.xml                                       |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
index 3f82889f5..c93cd4e9d 100644
--- a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
+++ b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
@@ -99,6 +99,12 @@ public class GeyserConnector {
 
     private static GeyserConnector instance;
 
+    /**
+     * This is used in GeyserConnect to stop the bedrock server binding to a port
+     */
+    @Setter
+    private static boolean shouldStartListener = true;
+
     @Setter
     private AuthType defaultAuthType;
 
@@ -219,14 +225,17 @@ public class GeyserConnector {
         }
 
         bedrockServer.setHandler(new ConnectorServerEventHandler(this));
-        bedrockServer.bind().whenComplete((avoid, throwable) -> {
-            if (throwable == null) {
-                logger.info(LanguageUtils.getLocaleStringLog("geyser.core.start", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort())));
-            } else {
-                logger.severe(LanguageUtils.getLocaleStringLog("geyser.core.fail", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort())));
-                throwable.printStackTrace();
-            }
-        }).join();
+
+        if (shouldStartListener) {
+            bedrockServer.bind().whenComplete((avoid, throwable) -> {
+                if (throwable == null) {
+                    logger.info(LanguageUtils.getLocaleStringLog("geyser.core.start", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort())));
+                } else {
+                    logger.severe(LanguageUtils.getLocaleStringLog("geyser.core.fail", config.getBedrock().getAddress(), String.valueOf(config.getBedrock().getPort())));
+                    throwable.printStackTrace();
+                }
+            }).join();
+        }
 
         if (config.getMetrics().isEnabled()) {
             metrics = new Metrics(this, "GeyserMC", config.getMetrics().getUniqueId(), false, java.util.logging.Logger.getLogger(""));
diff --git a/pom.xml b/pom.xml
index 4462c3f47..554fd5e3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.20</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>