diff --git a/pom.xml b/pom.xml index 5f0e6563..d39d54e0 100644 --- a/pom.xml +++ b/pom.xml @@ -130,13 +130,13 @@ org.spigotmc spigot-api - 1.19-R0.1-SNAPSHOT + 1.21-R0.1-SNAPSHOT provided - com.github.StarWishsama + com.github.SlimefunGuguProject Slimefun4 - 2024.3 + 38953fe13a 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 d6e6cd1e..721322eb 100644 --- a/src/main/java/io/github/sefiraat/networks/utils/StackUtils.java +++ b/src/main/java/io/github/sefiraat/networks/utils/StackUtils.java @@ -1,6 +1,7 @@ package io.github.sefiraat.networks.utils; import io.github.sefiraat.networks.network.stackcaches.ItemStackCache; +import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; import io.github.thebusybiscuit.slimefun4.libraries.dough.data.persistent.PersistentDataAPI; import lombok.experimental.UtilityClass; @@ -268,8 +269,14 @@ 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 (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_20_5)) { + if (instanceOne.getBasePotionType() != instanceTwo.getBasePotionType()) { + return true; + } + } else { + if (!instanceOne.getBasePotionData().equals(instanceTwo.getBasePotionData())) { + return true; + } } if (instanceOne.hasCustomEffects() != instanceTwo.hasCustomEffects()) { return true;