From 32161333dda65cfe90849c1c8ba8b23d25dad225 Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Fri, 20 Jul 2018 15:47:05 -0300
Subject: [PATCH] Fix custom enchantments

---
 .../packets/InventoryPackets.java             | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
index 1025771f7..ae647c85e 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
@@ -315,11 +315,12 @@ public class InventoryPackets {
                 for (Tag enchEntry : ench) {
                     if (enchEntry instanceof CompoundTag) {
                         CompoundTag enchantmentEntry = new CompoundTag("");
-                        enchantmentEntry.put(new StringTag("id",
-                                MappingData.oldEnchantmentsIds.get(
-                                        (short) ((CompoundTag) enchEntry).get("id").getValue()
-                                )
-                        ));
+                        short oldId = (short) ((CompoundTag) enchEntry).get("id").getValue();
+                        String newId = MappingData.oldEnchantmentsIds.get(oldId);
+                        if (newId == null){
+                            newId = "viaversion:legacy/"+oldId;
+                        }
+                        enchantmentEntry.put(new StringTag("id", newId));
                         enchantmentEntry.put(new ShortTag("lvl", (Short) ((CompoundTag) enchEntry).get("lvl").getValue()));
                         enchantments.add(enchantmentEntry);
                     }
@@ -333,10 +334,13 @@ public class InventoryPackets {
                 for (Tag enchEntry : storedEnch) {
                     if (enchEntry instanceof CompoundTag) {
                         CompoundTag enchantmentEntry = new CompoundTag("");
+                        short oldId = (short) ((CompoundTag) enchEntry).get("id").getValue();
+                        String newId = MappingData.oldEnchantmentsIds.get(oldId);
+                        if (newId == null) {
+                            newId = "viaversion:legacy/"+oldId;
+                        }
                         enchantmentEntry.put(new StringTag("id",
-                                MappingData.oldEnchantmentsIds.get(
-                                        (short) ((CompoundTag) enchEntry).get("id").getValue()
-                                )
+                                newId
                         ));
                         enchantmentEntry.put(new ShortTag("lvl", (Short) ((CompoundTag) enchEntry).get("lvl").getValue()));
                         newStoredEnch.add(enchantmentEntry);
@@ -495,12 +499,15 @@ public class InventoryPackets {
                 for (Tag enchantmentEntry : enchantments) {
                     if (enchantmentEntry instanceof CompoundTag) {
                         CompoundTag enchEntry = new CompoundTag("");
+                        String newId = (String) ((CompoundTag) enchantmentEntry).get("id").getValue();
+                        Short oldId = MappingData.oldEnchantmentsIds.inverse().get(newId);
+                        if (oldId == null && newId.startsWith("viaversion:legacy/")){
+                            oldId = Short.valueOf(newId.substring(18));
+                        }
                         enchEntry.put(
                                 new ShortTag(
                                         "id",
-                                        MappingData.oldEnchantmentsIds.inverse().get(
-                                                (String) ((CompoundTag) enchantmentEntry).get("id").getValue()
-                                        )
+                                        oldId
                                 )
                         );
                         enchEntry.put(new ShortTag("lvl", (Short) ((CompoundTag) enchantmentEntry).get("lvl").getValue()));