From 925b2da40b28329f40333440dc2862b6838795c6 Mon Sep 17 00:00:00 2001
From: rtm516 <ryantmilner@hotmail.co.uk>
Date: Sat, 24 Oct 2020 23:07:46 +0100
Subject: [PATCH] Fix Geyser starting when joining bedrock server

---
 src/main/java/org/geysermc/connect/utils/Player.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/geysermc/connect/utils/Player.java b/src/main/java/org/geysermc/connect/utils/Player.java
index d38ffc3..d8b9ca6 100644
--- a/src/main/java/org/geysermc/connect/utils/Player.java
+++ b/src/main/java/org/geysermc/connect/utils/Player.java
@@ -217,8 +217,10 @@ public class Player {
         // this wont show up in alot of cases as the client connects quite quickly
         sendWindow(FormID.CONNECTING, UIHandler.getWaitingScreen(server));
 
-        // Create the Geyser instance if its not already running
-        MasterServer.getInstance().createGeyserProxy();
+        if (!server.isBedrock()) {
+            // Create the Geyser instance if its not already running
+            MasterServer.getInstance().createGeyserProxy();
+        }
 
         // Send the user over to the server
         setCurrentServer(server);