From 2f058e05bdf63cb9501c43ad805c66d15f168e01 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sun, 14 Mar 2021 12:52:09 -0400
Subject: [PATCH] Allow dyed horse leather armor to translate (#2016)

---
 .../nbt/LeatherArmorTranslator.java           | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java
index f78eadc25..c2305738d 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java
@@ -35,29 +35,28 @@ import org.geysermc.connector.network.translators.item.ItemEntry;
 @ItemRemapper
 public class LeatherArmorTranslator extends NbtItemStackTranslator {
 
-    private static final String[] ITEMS = new String[]{"minecraft:leather_helmet", "minecraft:leather_chestplate", "minecraft:leather_leggings", "minecraft:leather_boots"};
+    private static final String[] ITEMS = new String[]{"minecraft:leather_helmet", "minecraft:leather_chestplate",
+            "minecraft:leather_leggings", "minecraft:leather_boots", "minecraft:leather_horse_armor"};
 
     @Override
     public void translateToBedrock(GeyserSession session, CompoundTag itemTag, ItemEntry itemEntry) {
-        if (!itemTag.contains("display")) {
+        CompoundTag displayTag = itemTag.get("display");
+        if (displayTag == null) {
             return;
         }
-        CompoundTag displayTag = itemTag.get("display");
-        if (displayTag.contains("color")) {
-            IntTag color = displayTag.get("color");
-            if (color != null) {
-                itemTag.put(new IntTag("customColor", color.getValue()));
-                displayTag.remove("color");
-            }
+        IntTag color = displayTag.get("color");
+        if (color != null) {
+            itemTag.put(new IntTag("customColor", color.getValue()));
+            displayTag.remove("color");
         }
     }
 
     @Override
     public void translateToJava(CompoundTag itemTag, ItemEntry itemEntry) {
-        if (!itemTag.contains("customColor")) {
+        IntTag color = itemTag.get("customColor");
+        if (color == null) {
             return;
         }
-        IntTag color = itemTag.get("customColor");
         CompoundTag displayTag = itemTag.get("display");
         if (displayTag == null) {
             displayTag = new CompoundTag("display");