From f0f7c9b74a4555174def4e740feca5e4f02d44dd Mon Sep 17 00:00:00 2001 From: Robotia Date: Fri, 29 Jan 2016 09:58:03 -0500 Subject: [PATCH] Spigot Fix (https://github.com/PaperSpigot/Paper-1.7/blob/master/CraftBukkit-Patches/0173-Skip-invalid-enchants-in-CraftMetaItem.patch) --- .../bukkit/craftbukkit/inventory/CraftMetaItem.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java index fe61134..39fef41 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -302,7 +302,16 @@ class CraftMetaItem implements ItemMeta, Repairable { int id = 0xffff & ((net.minecraft.nbt.NBTTagCompound) ench.getCompoundTagAt(i)).getShort(ENCHANTMENTS_ID.NBT); int level = 0xffff & ((net.minecraft.nbt.NBTTagCompound) ench.getCompoundTagAt(i)).getShort(ENCHANTMENTS_LVL.NBT); - enchantments.put(Enchantment.getById(id), level); + // Spigot Start - skip invalid enchantments + /* + * Its a rare case but when loading a world from a modded server which added enchantments + * CraftMetaItem would add a null enchantment into the enchantment map which causes + * NullPointers later + */ + Enchantment inch = Enchantment.getById(id); + if (inch == null) continue; + enchantments.put(inch, level); + // Spigot end } return enchantments;