diff options
| author | md_5 <git@md-5.net> | 2018-07-19 11:34:19 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-07-19 11:35:12 +1000 |
| commit | 80fefcf5ef80c54e27324bb6c8e61f0bdc056f44 (patch) | |
| tree | eb220f09c5badb24079e4259e48d47f23cdc32f6 /src/main/java | |
| parent | fc1b107579cf85654e84cbaf074dd5eaceeae3c6 (diff) | |
| download | craftbukkit-80fefcf5ef80c54e27324bb6c8e61f0bdc056f44.tar craftbukkit-80fefcf5ef80c54e27324bb6c8e61f0bdc056f44.tar.gz craftbukkit-80fefcf5ef80c54e27324bb6c8e61f0bdc056f44.tar.lz craftbukkit-80fefcf5ef80c54e27324bb6c8e61f0bdc056f44.tar.xz craftbukkit-80fefcf5ef80c54e27324bb6c8e61f0bdc056f44.zip | |
SPIGOT-4047: Ignore non-existent potions
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaPotion.java | 5 |
1 files changed, 5 insertions, 0 deletions
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); |