From ca3f9550dd466adbdd5e1793eb9673624024ab17 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Thu, 4 Mar 2021 12:26:16 -0500
Subject: [PATCH] Remove unused variables; fix opening double chests quickly

---
 .../geysermc/connector/network/session/GeyserSession.java  | 6 ------
 .../bedrock/BedrockContainerCloseTranslator.java           | 1 -
 .../bedrock/BedrockInventoryTransactionTranslator.java     | 4 ----
 .../translators/java/world/JavaTradeListTranslator.java    | 7 ++++---
 .../java/org/geysermc/connector/utils/InventoryUtils.java  | 3 +++
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
index 77ca0d6ff..68f6297e1 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -250,12 +250,6 @@ public class GeyserSession implements CommandSender {
     @Setter
     private Entity ridingVehicleEntity;
 
-    @Setter
-    private long lastWindowCloseTime = 0;
-
-    @Setter
-    private long lastInteractedVillagerEid;
-
     @Setter
     private Int2ObjectMap<Recipe> craftingRecipes;
     private final Set<String> unlockedRecipes;
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 c2e0618ba..21bc1e437 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
@@ -40,7 +40,6 @@ public class BedrockContainerCloseTranslator extends PacketTranslator<ContainerC
     @Override
     public void translate(ContainerClosePacket packet, GeyserSession session) {
         session.addInventoryTask(() -> {
-            session.setLastWindowCloseTime(0);
             byte windowId = packet.getId();
 
             //Client wants close confirmation
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
index 79f658188..440dff571 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
@@ -327,10 +327,6 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
                         session.sendDownstreamPacket(interactAtPacket);
 
                         EntitySoundInteractionHandler.handleEntityInteraction(session, vector, entity);
-
-                        if (entity instanceof AbstractMerchantEntity) {
-                            session.setLastInteractedVillagerEid(packet.getRuntimeEntityId());
-                        }
                         break;
                     case 1: //Attack
                         if (entity.getEntityType() == EntityType.ENDER_DRAGON) {
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaTradeListTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaTradeListTranslator.java
index 8a29be913..9ecffe1d1 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaTradeListTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaTradeListTranslator.java
@@ -77,7 +77,8 @@ public class JavaTradeListTranslator extends PacketTranslator<ServerTradeListPac
         updateTradePacket.setPlayerUniqueEntityId(session.getPlayerEntity().getGeyserId());
         updateTradePacket.setTraderUniqueEntityId(villager.getGeyserId());
         NbtMapBuilder builder = NbtMap.builder();
-        List<NbtMap> tags = new ArrayList<>();
+        boolean addExtraTrade = packet.isRegularVillager() && packet.getVillagerLevel() < 5;
+        List<NbtMap> tags = new ArrayList<>(addExtraTrade ? packet.getTrades().length + 1 : packet.getTrades().length);
         for (int i = 0; i < packet.getTrades().length; i++) {
             VillagerTrade trade = packet.getTrades()[i];
             NbtMapBuilder recipe = NbtMap.builder();
@@ -101,7 +102,7 @@ public class JavaTradeListTranslator extends PacketTranslator<ServerTradeListPac
         }
 
         //Hidden trade to fix visual experience bug
-        if (packet.isRegularVillager() && packet.getVillagerLevel() < 5) {
+        if (addExtraTrade) {
             tags.add(NbtMap.builder()
                     .putInt("maxUses", 0)
                     .putInt("traderExp", 0)
@@ -117,7 +118,7 @@ public class JavaTradeListTranslator extends PacketTranslator<ServerTradeListPac
         }
 
         builder.putList("Recipes", NbtType.COMPOUND, tags);
-        List<NbtMap> expTags = new ArrayList<>();
+        List<NbtMap> expTags = new ArrayList<>(5);
         expTags.add(NbtMap.builder().putInt("0", 0).build());
         expTags.add(NbtMap.builder().putInt("1", 10).build());
         expTags.add(NbtMap.builder().putInt("2", 70).build());
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 9588333d1..ccaa20e82 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/InventoryUtils.java
@@ -79,6 +79,9 @@ public class InventoryUtils {
                         if (openInv != null && openInv.getId() == inventory.getId()) {
                             translator.openInventory(session, inventory);
                             translator.updateInventory(session, inventory);
+                        } else if (openInv != null && openInv.isPending()) {
+                            // Presumably, this inventory is no longer relevant, and the client doesn't care about it
+                            displayInventory(session, openInv);
                         }
                 }), 200, TimeUnit.MILLISECONDS);
             } else {