From 2355c503c929f792634c78cb26f7b9c2528a656f Mon Sep 17 00:00:00 2001
From: James Harrison <james@fasttortoise.co.uk>
Date: Fri, 8 May 2020 03:49:44 +0100
Subject: [PATCH] Enderchest and Invisible Players fix. (#506)

* Fix EnderChests not showing on legacy servers (Hypixel)
Fix NPCs/Players sometimes being invisible

* Remove unused import

* Fix standard
---
 .../java/entity/player/JavaPlayerListEntryTranslator.java   | 3 ++-
 .../java/org/geysermc/connector/utils/BlockEntityUtils.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java
index 5fff40b1..2f71d683 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerListEntryTranslator.java
@@ -63,8 +63,9 @@ public class JavaPlayerListEntryTranslator extends PacketTranslator<ServerPlayer
                     );
                 }
 
-                session.getEntityCache().addPlayerEntity(playerEntity);
                 playerEntity.setPlayerList(true);
+                playerEntity.setValid(true);
+                session.getEntityCache().addPlayerEntity(playerEntity);
 
                 translate.getEntries().add(SkinUtils.buildCachedEntry(entry.getProfile(), playerEntity.getGeyserId()));
             } else {
diff --git a/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java b/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java
index c595eee4..9423a4f8 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/BlockEntityUtils.java
@@ -3,7 +3,6 @@ package org.geysermc.connector.utils;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
 import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
-
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.Translators;
 import org.geysermc.connector.network.translators.world.block.entity.BlockEntityTranslator;
@@ -13,13 +12,16 @@ public class BlockEntityUtils {
     private static final BlockEntityTranslator EMPTY_TRANSLATOR = Translators.getBlockEntityTranslators().get("Empty");
 
     public static String getBedrockBlockEntityId(String id) {
-        // This is the only exception when it comes to block entity ids
+        // These are the only exceptions when it comes to block entity ids
         if (id.contains("piston_head"))
             return "PistonArm";
 
         if (id.contains("trapped_chest"))
             return "Chest";
 
+        if (id.contains("EnderChest"))
+            return "EnderChest";
+
         id = id.toLowerCase()
             .replace("minecraft:", "")
             .replace("_", " ");