Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add potion effect type comparator #6832

Merged
merged 4 commits into from
Jul 1, 2024
Merged

Add potion effect type comparator #6832

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74a1148
DefaultComparators - fix potion effect type match
ShaneBeee Jun 30, 2024
a320baf
DefaultComparators - fix potion effect type match - add test
ShaneBeee Jun 30, 2024
b362946
DefaultComparators - update pickle suggestion
ShaneBeee Jun 30, 2024
27ff1c1
Merge branch 'dev/feature' into fix/potion-compare
sovdeeth Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/ch/njol/skript/classes/data/DefaultComparators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffectType;
import org.skriptlang.skript.lang.comparator.Comparator;
import org.skriptlang.skript.lang.comparator.Comparators;
import org.skriptlang.skript.lang.comparator.Relation;
Expand Down Expand Up @@ -653,6 +654,14 @@ public boolean supportsOrdering() {
return false;
}
});

// Potion Effect Type
Comparators.registerComparator(PotionEffectType.class, PotionEffectType.class, new Comparator<PotionEffectType, PotionEffectType>() {
@Override
public Relation compare(PotionEffectType effectOne, PotionEffectType effectTwo) {
return Relation.get(effectOne.equals(effectTwo));
}
});
ShaneBeee marked this conversation as resolved.
Show resolved Hide resolved
}

}