From 182f6313986ff74f2ede47f96811ea4a70cecd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pitteli=20Gon=C3=A7alves?= Date: Wed, 11 Dec 2024 19:23:18 -0300 Subject: [PATCH 1/2] slimefun lib update --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 16151e3d33a74b9876651bd5ea6f27cc95dd08ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pitteli=20Gon=C3=A7alves?= Date: Wed, 11 Dec 2024 19:33:16 -0300 Subject: [PATCH 2/2] fix remove potions without basedata from grid/storages --- .../io/github/sefiraat/networks/utils/StackUtils.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; }