From 80fefcf5ef80c54e27324bb6c8e61f0bdc056f44 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 19 Jul 2018 11:34:19 +1000 Subject: SPIGOT-4047: Ignore non-existent potions --- src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java') diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java index 6a58ab56..43b9d96b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java @@ -71,6 +71,11 @@ class CraftMetaPotion extends CraftMetaItem implements PotionMeta { for (int i = 0; i < length; i++) { NBTTagCompound effect = list.getCompound(i); PotionEffectType type = PotionEffectType.getById(effect.getByte(ID.NBT)); + // SPIGOT-4047: Vanilla just disregards these + if (type == null) { + continue; + } + int amp = effect.getByte(AMPLIFIER.NBT); int duration = effect.getInt(DURATION.NBT); boolean ambient = effect.getBoolean(AMBIENT.NBT); -- cgit v1.2.3