From e9ffe661317418a77cf3180f5067aa45726c06ef Mon Sep 17 00:00:00 2001
From: KennyTV <28825609+KennyTV@users.noreply.github.com>
Date: Tue, 2 Jul 2019 19:48:42 +0200
Subject: [PATCH] Fix 1.14 dummy enchant being lost 1.13 conversion

---
 .../packets/BlockItemPackets1_13.java         | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
index b7b87e76..bef1d754 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
@@ -762,6 +762,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
         ListTag noMapped = new ListTag(NBT_TAG_NAME + "|" + key, CompoundTag.class);
         ListTag newEnchantments = new ListTag(storedEnch ? key : "ench", CompoundTag.class);
         List<Tag> lore = new ArrayList<>();
+        boolean hasValidEnchants = false;
         for (Tag enchantmentEntry : enchantments.clone()) {
             CompoundTag enchEntry = new CompoundTag("");
             String newId = (String) ((CompoundTag) enchantmentEntry).get("id").getValue();
@@ -774,31 +775,37 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
                 if (oldId == null && newId.startsWith("viaversion:legacy/")) {
                     oldId = Short.valueOf(newId.substring(18));
                 }
+                Short level = (Short) ((CompoundTag) enchantmentEntry).get("lvl").getValue();
+                if (level != 0)
+                    hasValidEnchants = true;
                 enchEntry.put(new ShortTag("id", oldId));
-                enchEntry.put(new ShortTag("lvl", (Short) ((CompoundTag) enchantmentEntry).get("lvl").getValue()));
+                enchEntry.put(new ShortTag("lvl", level));
                 newEnchantments.add(enchEntry);
             }
         }
 
-        if (!lore.isEmpty()) {
-            if (!storedEnch && newEnchantments.size() == 0) {
-                IntTag hideFlags = tag.get("HideFlags");
-                if (hideFlags == null) {
-                    hideFlags = new IntTag("HideFlags");
-                } else {
-                    tag.put(new IntTag(NBT_TAG_NAME + "|OldHideFlags", hideFlags.getValue()));
-                }
+        // Put here to hide empty enchantment from 1.14 rewrites
+        if (!storedEnch && !hasValidEnchants) {
+            IntTag hideFlags = tag.get("HideFlags");
+            if (hideFlags == null) {
+                hideFlags = new IntTag("HideFlags");
+            } else {
+                tag.put(new IntTag(NBT_TAG_NAME + "|OldHideFlags", hideFlags.getValue()));
+            }
 
+            if (newEnchantments.size() == 0) {
                 CompoundTag enchEntry = new CompoundTag("");
                 enchEntry.put(new ShortTag("id", (short) 0));
-                enchEntry.put(new ShortTag("lvl", (short) 1));
-
-                hideFlags.setValue(hideFlags.getValue() | 1);
-                tag.put(hideFlags);
-
+                enchEntry.put(new ShortTag("lvl", (short) 0));
                 newEnchantments.add(enchEntry);
             }
 
+            int value = hideFlags.getValue() | 1;
+            hideFlags.setValue(value);
+            tag.put(hideFlags);
+        }
+
+        if (!lore.isEmpty()) {
             tag.put(noMapped);
 
             CompoundTag display = tag.get("display");