From 1d8995efe6d8457e9e2809a0112e06a579ca70a8 Mon Sep 17 00:00:00 2001
From: AJ Ferguson <AJ-Ferguson@users.noreply.github.com>
Date: Thu, 4 Jun 2020 10:49:32 -0800
Subject: [PATCH] Add minimum delay between closing and opening a new window
 (#735)

Should fix new windows not showing up with some plugins like Lottery.
---
 .../bedrock/BedrockContainerCloseTranslator.java       |  2 --
 .../java/window/JavaOpenWindowTranslator.java          | 10 ++--------
 .../org/geysermc/connector/utils/InventoryUtils.java   |  8 +++++++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java
index 05eac2032..4c531c485 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockContainerCloseTranslator.java
@@ -53,8 +53,6 @@ public class BedrockContainerCloseTranslator extends PacketTranslator<ContainerC
             ClientCloseWindowPacket closeWindowPacket = new ClientCloseWindowPacket(windowId);
             session.getDownstream().getSession().send(closeWindowPacket);
             InventoryUtils.closeInventory(session, windowId);
-        } else if (openInventory != null && openInventory.getId() != windowId) {
-            InventoryUtils.openInventory(session, openInventory);
         }
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java
index aad94e962..dde45cf89 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaOpenWindowTranslator.java
@@ -50,10 +50,8 @@ public class JavaOpenWindowTranslator extends PacketTranslator<ServerOpenWindowP
         Inventory openInventory = session.getInventoryCache().getOpenInventory();
         if (newTranslator == null) {
             if (openInventory != null) {
-                ContainerClosePacket closePacket = new ContainerClosePacket();
-                closePacket.setWindowId((byte)openInventory.getId());
-                session.sendUpstreamPacket(closePacket);
-                InventoryTranslator.INVENTORY_TRANSLATORS.get(openInventory.getWindowType()).closeInventory(session, openInventory);
+                InventoryUtils.closeWindow(session, openInventory.getId());
+                InventoryUtils.closeInventory(session, openInventory.getId());
             }
             ClientCloseWindowPacket closeWindowPacket = new ClientCloseWindowPacket(packet.getWindowId());
             session.sendDownstreamPacket(closeWindowPacket);
@@ -80,10 +78,6 @@ public class JavaOpenWindowTranslator extends PacketTranslator<ServerOpenWindowP
             if (!openTranslator.getClass().equals(newTranslator.getClass())) {
                 InventoryUtils.closeWindow(session, openInventory.getId());
                 InventoryUtils.closeInventory(session, openInventory.getId());
-                session.getInventoryCache().setOpenInventory(newInventory);
-                //The new window will be opened when the bedrock client sends the
-                //window close confirmation in BedrockContainerCloseTranslator
-                return;
             }
         }
 
diff --git a/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java b/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
index 5574a3a91..ded47723a 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
@@ -54,12 +54,18 @@ public class InventoryUtils {
         if (translator != null) {
             session.getInventoryCache().setOpenInventory(inventory);
             translator.prepareInventory(session, inventory);
+            //Ensure at least half a second passes between closing and opening a new window
+            //The client will not open the new window if it is still closing the old one
+            long delay = 500 - (System.currentTimeMillis() - session.getLastWindowCloseTime());
             //TODO: find better way to handle double chest delay
             if (translator instanceof DoubleChestInventoryTranslator) {
+                delay = Math.max(delay, 200);
+            }
+            if (delay > 0) {
                 GeyserConnector.getInstance().getGeneralThreadPool().schedule(() -> {
                     translator.openInventory(session, inventory);
                     translator.updateInventory(session, inventory);
-                }, 200, TimeUnit.MILLISECONDS);
+                }, delay, TimeUnit.MILLISECONDS);
             } else {
                 translator.openInventory(session, inventory);
                 translator.updateInventory(session, inventory);