diff options
| author | md_5 <git@md-5.net> | 2017-04-26 15:45:52 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-04-26 15:45:52 +1000 |
| commit | 28d993ccec1174fc5ed397edca02c50e75213865 (patch) | |
| tree | 83991ffa3c505ad4cef59ea1acda569503c030ea /src | |
| parent | c19c2932bf14b62a6d31266c8ccd9003bfe05e91 (diff) | |
| download | craftbukkit-28d993ccec1174fc5ed397edca02c50e75213865.tar craftbukkit-28d993ccec1174fc5ed397edca02c50e75213865.tar.gz craftbukkit-28d993ccec1174fc5ed397edca02c50e75213865.tar.lz craftbukkit-28d993ccec1174fc5ed397edca02c50e75213865.tar.xz craftbukkit-28d993ccec1174fc5ed397edca02c50e75213865.zip | |
Skip invalid enchants in CraftMetaItem
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index 0ad60e84..65b58448 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -358,7 +358,10 @@ class CraftMetaItem implements ItemMeta, Repairable { int id = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_ID.NBT); int level = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_LVL.NBT); - enchantments.put(Enchantment.getById(id), level); + Enchantment enchant = Enchantment.getById(id); + if (enchant != null) { + enchantments.put(enchant, level); + } } return enchantments; |