CPU/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Fix NPE for unknown enchantments/enchantments not in bedrock

Browse source
This commit is contained in:
RednedEpic 2020-04-23 02:09:40 -05:00
parent 6f7ad4b569
commit 59b2805a4a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java
View file

@ -58,8 +58,10 @@ public class EnchantmentTranslator extends NbtItemStackTranslator {
if (!(tag instanceof CompoundTag)) continue; if (!(tag instanceof CompoundTag)) continue;
CompoundTag bedrockTag = remapEnchantment((CompoundTag) tag); CompoundTag bedrockTag = remapEnchantment((CompoundTag) tag);
bedrockTag.put(new ShortTag("GeyserStoredEnchantment", (short) 0)); if (bedrockTag != null) {
newTags.add(bedrockTag); bedrockTag.put(new ShortTag("GeyserStoredEnchantment", (short) 0));
newTags.add(bedrockTag);
}
} }
itemTag.remove("StoredEnchantments"); itemTag.remove("StoredEnchantments");
} }
@ -117,11 +119,11 @@ public class EnchantmentTranslator extends NbtItemStackTranslator {
private CompoundTag remapEnchantment(CompoundTag tag) { private CompoundTag remapEnchantment(CompoundTag tag) {
Tag javaEnchLvl = ((CompoundTag) tag).get("lvl"); Tag javaEnchLvl = tag.get("lvl");
if (!(javaEnchLvl instanceof ShortTag)) if (!(javaEnchLvl instanceof ShortTag))
return null; return null;
Tag javaEnchId = ((CompoundTag) tag).get("id"); Tag javaEnchId = tag.get("id");
if (!(javaEnchId instanceof StringTag)) if (!(javaEnchId instanceof StringTag))
return null; return null;