Use the inventory name always for villager inventories

Testing not crashing on 1.8 and 1.13.2.
bundabrg · Feb 27, 2021 · ab9501d · ab9501d
1 parent 9788ed4
commit ab9501d
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/...n/java/org/geysermc/connector/network/translators/java/world/JavaTradeListTranslator.java b/...n/java/org/geysermc/connector/network/translators/java/world/JavaTradeListTranslator.java
@@ -31,12 +31,11 @@
 import com.nukkitx.nbt.NbtMap;
 import com.nukkitx.nbt.NbtMapBuilder;
 import com.nukkitx.nbt.NbtType;
-import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
 import com.nukkitx.protocol.bedrock.data.entity.EntityData;
+import com.nukkitx.protocol.bedrock.data.inventory.ContainerType;
 import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
 import com.nukkitx.protocol.bedrock.packet.UpdateTradePacket;
 import org.geysermc.connector.entity.Entity;
-import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.inventory.MerchantContainer;
 import org.geysermc.connector.network.session.GeyserSession;
@@ -71,16 +70,7 @@ public void translate(ServerTradeListPacket packet, GeyserSession session) {
         updateTradePacket.setTradeTier(packet.getVillagerLevel() - 1);
         updateTradePacket.setContainerId((short) packet.getWindowId());
         updateTradePacket.setContainerType(ContainerType.TRADE);
-        String displayName;
-        //TODO: verify correct window title behavior
-        Entity realVillager = session.getEntityCache().getEntityByGeyserId(session.getLastInteractedVillagerEid());
-        if (realVillager != null && realVillager.getMetadata().containsKey(EntityData.NAMETAG) && realVillager.getMetadata().getString(EntityData.NAMETAG) != null) {
-            displayName = realVillager.getMetadata().getString(EntityData.NAMETAG);
-        } else {
-            displayName = realVillager != null &&
-                    realVillager.getEntityType() == EntityType.WANDERING_TRADER ? "Wandering Trader" : "Villager";
-        }
-        updateTradePacket.setDisplayName(displayName);
+        updateTradePacket.setDisplayName(openInventory.getTitle());
         updateTradePacket.setSize(0);
         updateTradePacket.setNewTradingUi(true);
         updateTradePacket.setUsingEconomyTrade(true);