From 953a90bdd36f39d87a4f8b4a828acbb67737d20c Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Thu, 23 Jul 2015 16:18:17 +0300
Subject: [PATCH] SPIGOT-749: Fix NullPointerException and broken logic in
 Potion.fromDamage(int)

By: Antony Riley <antony@cyberiantiger.org>
---
 paper-api/src/main/java/org/bukkit/potion/Potion.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-api/src/main/java/org/bukkit/potion/Potion.java b/paper-api/src/main/java/org/bukkit/potion/Potion.java
index 265b050579..35428bd0bd 100644
--- a/paper-api/src/main/java/org/bukkit/potion/Potion.java
+++ b/paper-api/src/main/java/org/bukkit/potion/Potion.java
@@ -405,7 +405,7 @@ public class Potion {
         if ((damage & SPLASH_BIT) > 0) {
             potion = potion.splash();
         }
-        if ((!type.equals(PotionType.INSTANT_DAMAGE) || type.equals(PotionType.FIRE_RESISTANCE)) && (damage & EXTENDED_BIT) > 0) {
+        if ((type == null || !type.isInstant()) && (damage & EXTENDED_BIT) > 0) {
             potion = potion.extend();
         }
         return potion;