Skip to content

Commit

Permalink
fix remove potions without basedata from grid/storages
Browse files Browse the repository at this point in the history
  • Loading branch information
scorninpc committed Dec 11, 2024
1 parent 182f631 commit 16151e3
Showing 1 changed file with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 16151e3

Please sign in to comment.