Cache forms until the player has fully initialized

GeyserMC · Dec 29, 2021 · d7eef7a · d7eef7a
1 parent 7beedb4
commit d7eef7a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java
@@ -52,9 +52,15 @@ public int addForm(Form form) {
         return windowId;
     }
 
-    public int showForm(Form form) {
+    public void showForm(Form form) {
         int windowId = addForm(form);
 
+        if (session.getUpstream().isInitialized()) {
+            sendForm(windowId, form);
+        }
+    }
+
+    private void sendForm(int windowId, Form form) {
         ModalFormRequestPacket formRequestPacket = new ModalFormRequestPacket();
         formRequestPacket.setFormId(windowId);
         formRequestPacket.setFormData(form.getJsonData());
@@ -68,8 +74,12 @@ public int showForm(Form form) {
             session.scheduleInEventLoop(() -> session.sendUpstreamPacket(latencyPacket),
                     500, TimeUnit.MILLISECONDS);
         }
+    }
 
-        return windowId;
+    public void resendAllForms() {
+        for (Int2ObjectMap.Entry<Form> entry : forms.int2ObjectEntrySet()) {
+            sendForm(entry.getIntKey(), entry.getValue());
+        }
     }
 
     public void handleResponse(ModalFormResponsePacket response) {

diff --git a/...ermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java b/...ermc/geyser/translator/protocol/bedrock/BedrockSetLocalPlayerAsInitializedTranslator.java
@@ -55,6 +55,9 @@ public void translate(GeyserSession session, SetLocalPlayerAsInitializedPacket p
                     if (session.getOpenInventory() != null && session.getOpenInventory().isPending()) {
                         InventoryUtils.openInventory(session, session.getOpenInventory());
                     }
+
+                    // What am I to expect - as of Bedrock 1.18
+                    session.getFormCache().resendAllForms();
                 }
             }
         }