Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-01-26 09:21:22 +01:00
Code Issues Projects Releases Wiki Activity

Fix invalid enchantment parsing

Browse Source 
Fixes #2418
This commit is contained in:
KennyTV 2021-04-02 18:22:18 +02:00
parent 070c7f5808
commit 1251d43709
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
View File

@ -329,9 +329,10 @@ public class InventoryPackets {
ListTag ench = tag.get("ench"); ListTag ench = tag.get("ench");
ListTag enchantments = new ListTag(CompoundTag.class); ListTag enchantments = new ListTag(CompoundTag.class);
for (Tag enchEntry : ench) { for (Tag enchEntry : ench) {
if (enchEntry instanceof CompoundTag) { NumberTag idTag;
if (enchEntry instanceof CompoundTag && (idTag = ((CompoundTag) enchEntry).get("id")) != null) {
CompoundTag enchantmentEntry = new CompoundTag(); CompoundTag enchantmentEntry = new CompoundTag();
short oldId = ((NumberTag) ((CompoundTag) enchEntry).get("id")).asShort(); short oldId = idTag.asShort();
String newId = Protocol1_13To1_12_2.MAPPINGS.getOldEnchantmentsIds().get(oldId); String newId = Protocol1_13To1_12_2.MAPPINGS.getOldEnchantmentsIds().get(oldId);
if (newId == null) { if (newId == null) {
newId = "viaversion:legacy/" + oldId; newId = "viaversion:legacy/" + oldId;