Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-10-22 12:30:01 +02:00
Code Issues Projects Releases Wiki Activity

Null check base potion data, fixes #2302

Browse Source
This commit is contained in:
PikaMug 2024-10-20 01:25:51 -04:00
parent 318f8e565b
commit 85442a4760
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java
View File

@ -149,6 +149,8 @@ public class BukkitItemUtil {
|| one.getType().equals(Material.SPLASH_POTION)) { || one.getType().equals(Material.SPLASH_POTION)) {
final PotionMeta pMeta1 = (PotionMeta) one.getItemMeta(); final PotionMeta pMeta1 = (PotionMeta) one.getItemMeta();
final PotionMeta pMeta2 = (PotionMeta) two.getItemMeta(); final PotionMeta pMeta2 = (PotionMeta) two.getItemMeta();
// 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())) { if (!pMeta1.getBasePotionData().getType().equals(pMeta2.getBasePotionData().getType())) {
return -9; return -9;
} }
@ -161,6 +163,7 @@ public class BukkitItemUtil {
} }
} }
} }
}
if (one.getItemMeta().toString().startsWith("TROPICAL_FISH_BUCKET_META")) { if (one.getItemMeta().toString().startsWith("TROPICAL_FISH_BUCKET_META")) {
final String meta1 = one.getItemMeta().toString(); final String meta1 = one.getItemMeta().toString();
final String meta2 = two.getItemMeta().toString(); final String meta2 = two.getItemMeta().toString();