13
0
geforkt von Mirrors/Paper

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

By: olivervscreeper <dev@olivervscreeper.co.uk>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2015-05-25 22:11:37 +01:00
Ursprung bb4a63e0aa
Commit f6175ea588

Datei anzeigen

@ -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;