From 3afa54527da6ce8aefc829c3c3dab909298dbafa Mon Sep 17 00:00:00 2001
From: OnlyBMan <27742182+OnlyBMan@users.noreply.github.com>
Date: Wed, 9 Oct 2019 19:23:28 -0400
Subject: [PATCH] Translates nametags for bedrock edition

---
 .../org/geysermc/connector/entity/Entity.java    |  1 -
 .../entity/JavaEntityMetadataTranslator.java     | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/connector/src/main/java/org/geysermc/connector/entity/Entity.java b/connector/src/main/java/org/geysermc/connector/entity/Entity.java
index 2b2ad0544..a22a38745 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/Entity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/Entity.java
@@ -141,7 +141,6 @@ public class Entity {
         flags.setFlag(EntityFlag.NO_AI, false);
 
         EntityDataDictionary dictionary = new EntityDataDictionary();
-        dictionary.put(EntityData.NAMETAG, "");
         dictionary.put(EntityData.ENTITY_AGE, 0);
         dictionary.put(EntityData.SCALE, 1f);
         dictionary.put(EntityData.MAX_AIR, (short) 400);
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java
index c0451eb7e..63ce16022 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/entity/JavaEntityMetadataTranslator.java
@@ -25,11 +25,16 @@
 
 package org.geysermc.connector.network.translators.java.entity;
 
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.github.steveice10.mc.protocol.data.message.Message;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityMetadataPacket;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.data.EntityFlag;
 import com.nukkitx.protocol.bedrock.packet.SetEntityDataPacket;
 import org.geysermc.connector.entity.Entity;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.utils.MessageUtils;
 
 public class JavaEntityMetadataTranslator extends PacketTranslator<ServerEntityMetadataPacket> {
 
@@ -48,6 +53,17 @@ public class JavaEntityMetadataTranslator extends PacketTranslator<ServerEntityM
             entityDataPacket.setRuntimeEntityId(entity.getGeyserId());
             entityDataPacket.getMetadata().putAll(entity.getMetadata());
 
+            //Translate Java nametag to Bedrock
+            for(EntityMetadata meta : packet.getMetadata()) {
+                switch(meta.getType()) {
+                    case OPTIONAL_CHAT:
+                        if(meta.getValue() != null) {
+                            Message nametag = (Message) meta.getValue();
+                            entityDataPacket.getMetadata().put(EntityData.NAMETAG, MessageUtils.getBedrockMessage(nametag));
+                        }
+                }
+            }
+
             session.getUpstream().sendPacket(entityDataPacket);
         } else {
             entity.spawnEntity(session);