From 85442a476028581fe1de3eb43aff1d08e7a84006 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Sun, 20 Oct 2024 01:25:51 -0400
Subject: [PATCH] Null check base potion data, fixes #2302

---
 .../pikamug/quests/util/BukkitItemUtil.java   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java b/core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java
index 54e5bca04..6b2525985 100644
--- a/core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java
+++ b/core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java
@@ -149,14 +149,17 @@ public class BukkitItemUtil {
                             || one.getType().equals(Material.SPLASH_POTION)) {
                         final PotionMeta pMeta1 = (PotionMeta) one.getItemMeta();
                         final PotionMeta pMeta2 = (PotionMeta) two.getItemMeta();
-                        if (!pMeta1.getBasePotionData().getType().equals(pMeta2.getBasePotionData().getType())) {
-                            return -9;
-                        }
-                        if (pMeta1.getBasePotionData().isExtended() != pMeta2.getBasePotionData().isExtended()) {
-                            return -9;
-                        }
-                        if (pMeta1.getBasePotionData().isUpgraded() != pMeta2.getBasePotionData().isUpgraded()) {
-                            return -9;
+                        // Base potion data can return null on newer versions (likely 1.20.6+)
+                        if (pMeta1.getBasePotionData() != null && pMeta2.getBasePotionData() != null) {
+                            if (!pMeta1.getBasePotionData().getType().equals(pMeta2.getBasePotionData().getType())) {
+                                return -9;
+                            }
+                            if (pMeta1.getBasePotionData().isExtended() != pMeta2.getBasePotionData().isExtended()) {
+                                return -9;
+                            }
+                            if (pMeta1.getBasePotionData().isUpgraded() != pMeta2.getBasePotionData().isUpgraded()) {
+                                return -9;
+                            }
                         }
                     }
                 }