OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-09 03:43:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
By: olivervscreeper <dev@olivervscreeper.co.uk>
This commit is contained in:
Bukkit/Spigot 2015-05-25 22:11:37 +01:00
parent bb4a63e0aa
commit f6175ea588
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
paper-api/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;