twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-10 09:02:09 -07:00
Code Issues Packages Projects Releases 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
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;