30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
|
From 191d3976ce28c03bad044b14dc96ab11d232e1eb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thinkofdeath <thinkofdeath@spigotmc.org>
|
||
|
|
Date: Tue, 19 Aug 2014 11:04:21 +0100
|
||
|
|
Subject: [PATCH] Skip invalid enchants in CraftMetaItem
|
||
|
|
|
||
|
|
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
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||
|
|
index adaac09..0a6b139 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||
|
|
@@ -432,7 +432,11 @@ 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);
|
||
|
|
+ // Spigot start - skip invalid enchantments
|
||
|
|
+ Enchantment e = Enchantment.getById(id);
|
||
|
|
+ if (e == null) continue;
|
||
|
|
+ // Spigot end
|
||
|
|
+ enchantments.put(e, level);
|
||
|
|
}
|
||
|
|
|
||
|
|
return enchantments;
|
||
|
|
--
|
||
|
|
1.9.1
|
||
|
|
|