spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-08-21 05:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Checked for instant potions, to fix NPE in serialization. Fixes SPIGOT-749

Browse source
This commit is contained in:
olivervscreeper 2015-05-25 22:11:37 +01:00 • committed by md_5
parent 7d306d4e02
commit fe015deb2a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/bukkit/potion/Potion.java
View file

@ -405,7 +405,7 @@ public class Potion {
if ((damage & SPLASH_BIT) > 0) {
potion = potion.splash();
}
if ((damage & EXTENDED_BIT) > 0) {
if ((!type.equals(PotionType.INSTANT_DAMAGE) || type.equals(PotionType.FIRE_RESISTANCE)) && (damage & EXTENDED_BIT) > 0) {
potion = potion.extend();
}
return potion;