From 5fe38fa83f0494fc979ea9751d6387f3a78fab72 Mon Sep 17 00:00:00 2001
From: Creeperface01 <honzaxp01@gmail.com>
Date: Wed, 20 May 2020 17:12:03 +0200
Subject: [PATCH] Show form window immediately after spawn (#606)

---
 .../connector/network/UpstreamPacketHandler.java      |  7 ++++++-
 .../connector/utils/LoginEncryptionUtils.java         | 11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
index dfc3112b..2fbd487d 100644
--- a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
+++ b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
@@ -110,7 +110,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
     }
 
     @Override
-    public boolean handle(MovePlayerPacket packet) {
+    public boolean handle(SetLocalPlayerAsInitializedPacket packet) {
         if (!session.isLoggedIn() && !session.isLoggingIn() && session.getConnector().getAuthType() == AuthType.ONLINE) {
             // TODO it is safer to key authentication on something that won't change (UUID, not username)
             if (!couldLoginUserByName(session.getAuthData().getName())) {
@@ -119,6 +119,11 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
             // else we were able to log the user in
             return true;
         }
+        return translateAndDefault(packet);
+    }
+
+    @Override
+    public boolean handle(MovePlayerPacket packet) {
         if (session.isLoggingIn()) {
             session.sendMessage("Please wait until you are logged in...");
         }
diff --git a/connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java b/connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
index 7f6c4760..f9a7fec2 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
@@ -34,7 +34,6 @@ import com.nukkitx.network.util.Preconditions;
 import com.nukkitx.protocol.bedrock.packet.LoginPacket;
 import com.nukkitx.protocol.bedrock.packet.ServerToClientHandshakePacket;
 import com.nukkitx.protocol.bedrock.util.EncryptionUtils;
-
 import org.geysermc.common.window.CustomFormBuilder;
 import org.geysermc.common.window.CustomFormWindow;
 import org.geysermc.common.window.FormWindow;
@@ -193,18 +192,22 @@ public class LoginEncryptionUtils {
                         String password = response.getInputResponses().get(2);
 
                         session.authenticate(email, password);
+                    } else {
+                        showLoginDetailsWindow(session);
                     }
 
                     // Clear windows so authentication data isn't accidentally cached
                     windowCache.getWindows().clear();
                 } else if (formId == AUTH_FORM_ID && window instanceof SimpleFormWindow) {
                     SimpleFormResponse response = (SimpleFormResponse) window.getResponse();
-                    if(response != null) {
-                        if(response.getClickedButtonId() == 0) {
+                    if (response != null) {
+                        if (response.getClickedButtonId() == 0) {
                             showLoginDetailsWindow(session);
-                        } else if(response.getClickedButtonId() == 1) {
+                        } else if (response.getClickedButtonId() == 1) {
                             session.disconnect("Login is required");
                         }
+                    } else {
+                        showLoginWindow(session);
                     }
                 }
             }