mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-25 02:17:35 +01:00
cab333b217
Don't send requests of every player was found in the global api cache SpigotMC/Spigot@841270ff1e Correctly set the response code for the cached lookups and return the ... SpigotMC/Spigot@f170b7899c Don't try and re-set the global api cache on reload SpigotMC/Spigot@b410a00a66 Use a compile time sneaky throw hack. SpigotMC/Spigot@508462b96b Fix a missed rename in WorldGenGroundBush SpigotMC/Spigot@0614d8fae9
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From 842db28944ed631553d61662ecc1df39963a0ccf 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 22df972..7a1536f 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
|
|
|