From da0b96ed0fab217313e8045a4a4309f2b677c433 Mon Sep 17 00:00:00 2001
From: rtm516 <ryantmilner@hotmail.co.uk>
Date: Sat, 5 Jun 2021 20:00:59 +0100
Subject: [PATCH] Start internal Geyser on boot

---
 src/main/java/org/geysermc/connect/MasterServer.java | 6 +++++-
 src/main/java/org/geysermc/connect/utils/Player.java | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/geysermc/connect/MasterServer.java b/src/main/java/org/geysermc/connect/MasterServer.java
index 49e3e89..703d5f4 100644
--- a/src/main/java/org/geysermc/connect/MasterServer.java
+++ b/src/main/java/org/geysermc/connect/MasterServer.java
@@ -129,7 +129,7 @@ public class MasterServer {
 
         // Create the base welcome.txt file
         try {
-            FileUtils.fileOrCopiedFromResource(new File(MasterServer.getInstance().getGeyserConnectConfig().getWelcomeFile()), "welcome.txt", (x) -> x);
+            FileUtils.fileOrCopiedFromResource(new File(getGeyserConnectConfig().getWelcomeFile()), "welcome.txt", (x) -> x);
         } catch (IOException ignored) { }
 
         start(geyserConnectConfig.getPort());
@@ -182,6 +182,10 @@ public class MasterServer {
 
         // Start server up
         bdServer.bind().join();
+
+        // Create the Geyser instance
+        createGeyserProxy();
+        
         logger.info("Server started on " + geyserConnectConfig.getAddress() + ":" + port);
     }
 
diff --git a/src/main/java/org/geysermc/connect/utils/Player.java b/src/main/java/org/geysermc/connect/utils/Player.java
index a394aa3..3f45431 100644
--- a/src/main/java/org/geysermc/connect/utils/Player.java
+++ b/src/main/java/org/geysermc/connect/utils/Player.java
@@ -252,11 +252,6 @@ public class Player {
             sendWindow(FormID.CONNECTING, UIHandler.getWaitingScreen(server));
         }
 
-        if (!server.isBedrock()) {
-            // Create the Geyser instance if its not already running
-            MasterServer.getInstance().createGeyserProxy();
-        }
-
         // Send the user over to the server
         setCurrentServer(server);
         connectToProxy();