diff --git a/pom.xml b/pom.xml index bb5c24540..dde450e6a 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ com.github.Slimefun Slimefun4 - 0a7fea8 + RC-37 provided diff --git a/src/main/java/io/github/sefiraat/networks/utils/StackUtils.java b/src/main/java/io/github/sefiraat/networks/utils/StackUtils.java index d6e6cd1ea..ed2ae8a24 100644 --- a/src/main/java/io/github/sefiraat/networks/utils/StackUtils.java +++ b/src/main/java/io/github/sefiraat/networks/utils/StackUtils.java @@ -268,9 +268,13 @@ public boolean canQuickEscapeMetaVariant(@Nonnull ItemMeta metaOne, @Nonnull Ite // Potion if (metaOne instanceof PotionMeta instanceOne && metaTwo instanceof PotionMeta instanceTwo) { - if (!instanceOne.getBasePotionData().equals(instanceTwo.getBasePotionData())) { - return true; + + if((instanceOne.getBasePotionData() != null) && (instanceTwo.getBasePotionData() != null)) { + if (!instanceOne.getBasePotionData().equals(instanceTwo.getBasePotionData())) { + return true; + } } + if (instanceOne.hasCustomEffects() != instanceTwo.hasCustomEffects()) { return true; }