Paper/CraftBukkit-Patches/0145-Skip-invalid-enchants-in-CraftMetaItem.patch

30 lines
1.3 KiB
Diff
Raw Normal View History

2015-06-01 11:22:52 +02:00
From ee04746a77b82b2b9e053135849a2700536315a8 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
2015-05-25 14:05:40 +02:00
index 9a8820b..e57431f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
2015-04-16 12:19:45 +02:00
@@ -460,7 +460,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;
--
2015-05-09 22:23:26 +02:00
2.1.4