From 90bbaf6c7fd654b12eeec193e1590fc9308162b5 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Mon, 14 Mar 2022 17:27:04 -0300
Subject: [PATCH] Remove waiting screen form (#60)

Fixes #41 (waiting screen hides disconnection message)
Also this is an old code from time when GeyserConnect used two ports
---
 src/main/java/org/geysermc/connect/ui/UIHandler.java | 10 ----------
 src/main/java/org/geysermc/connect/utils/Player.java |  7 +------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/main/java/org/geysermc/connect/ui/UIHandler.java b/src/main/java/org/geysermc/connect/ui/UIHandler.java
index 30669f2..9739504 100644
--- a/src/main/java/org/geysermc/connect/ui/UIHandler.java
+++ b/src/main/java/org/geysermc/connect/ui/UIHandler.java
@@ -92,16 +92,6 @@ public class UIHandler {
         return window.build();
     }
 
-    /**
-     * Create a simple connecting message form
-     *
-     * @param server The server info to display
-     * @return A {@link SimpleForm} object
-     */
-    public static Form getWaitingScreen(Server server) {
-        return SimpleForm.builder().title("Connecting").content("Please wait while we connect you to " + server.toString()).build();
-    }
-
     /**
      * Create a direct connect form
      *
diff --git a/src/main/java/org/geysermc/connect/utils/Player.java b/src/main/java/org/geysermc/connect/utils/Player.java
index 5b82e71..8c8bea6 100644
--- a/src/main/java/org/geysermc/connect/utils/Player.java
+++ b/src/main/java/org/geysermc/connect/utils/Player.java
@@ -39,7 +39,6 @@ import lombok.Setter;
 import org.geysermc.connect.MasterServer;
 import org.geysermc.connect.proxy.GeyserProxySession;
 import org.geysermc.connect.ui.FormID;
-import org.geysermc.connect.ui.UIHandler;
 import org.geysermc.cumulus.Form;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.network.UpstreamPacketHandler;
@@ -273,11 +272,7 @@ public class Player {
     }
 
     public void sendToServer(Server server) {
-        // Tell the user we are connecting them
-        // This wont show up in a lot of cases as the client connects quite quickly
-        if (!server.isOnline()) {
-            sendWindow(FormID.CONNECTING, UIHandler.getWaitingScreen(server));
-        }
+        // Geyser will show a "please wait" message in action bar
 
         // Send the user over to the server
         setCurrentServer(server);