2014-12-04 01:13:06 +01:00
|
|
|
From 3afef16f899a9de931737b9b7f712357fcf6f947 Mon Sep 17 00:00:00 2001
|
2014-08-19 20:40:15 +02:00
|
|
|
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
|
2014-12-04 01:13:06 +01:00
|
|
|
index 7f3339c..9db1c14 100644
|
2014-08-19 20:40:15 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
2014-12-04 01:13:06 +01:00
|
|
|
@@ -433,7 +433,11 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
2014-08-19 20:40:15 +02:00
|
|
|
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;
|
|
|
|
--
|
2014-11-28 02:17:45 +01:00
|
|
|
2.1.0
|
2014-08-19 20:40:15 +02:00
|
|
|
|