From e9f2a5c17f8c72aea7d0a492975b1bf2cdd07b0e Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Wed, 15 Oct 2025 13:35:00 +0200
Subject: [PATCH] Fix: Queue forms that are opened before the session is
 initialized

---
 .../main/java/org/geysermc/geyser/session/GeyserSession.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
index ae1cedc63..e3a4e964a 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -1697,7 +1697,7 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
         // Open the current form, unless we're in the process of closing another
         // If we're waiting, the form will be sent when Bedrock confirms closing
         // If we don't wait, the client rejects the form as it is busy
-        if (!isClosingInventory()) {
+        if (!isClosingInventory() && upstream.isInitialized()) {
             formCache.resendAllForms();
         }