Skip to content

Treat SkriptPotionEffect as PotionEffect for ClassInfo comparison #8814

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

Open
APickledWalrus wants to merge 1 commit into
base: dev/patch
Choose a base branch
from
+17 −9
Open

Treat SkriptPotionEffect as PotionEffect for ClassInfo comparison #8814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 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 @@ -30,6 +30,8 @@
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.skriptlang.skript.bukkit.potion.util.SkriptPotionEffect;
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 @@ -446,16 +448,20 @@ public boolean supportsOrdering() {
});

// Object - ClassInfo
Comparators.registerComparator(Object.class, ClassInfo.class, new Comparator<Object, ClassInfo>() {
@Override
public Relation compare(Object o, ClassInfo c) {
return Relation.get(c.getC().isInstance(o) || o instanceof ClassInfo && c.getC().isAssignableFrom(((ClassInfo<?>) o).getC()));
}

@Override
public boolean supportsOrdering() {
return false;
Comparators.registerComparator(Object.class, ClassInfo.class, (object, classInfo) -> {
if (classInfo.getC().isInstance(object)) {
return Relation.EQUAL;
}
Class<?> objectClass;
if (object instanceof ClassInfo<?> objectClassInfo) {
objectClass = objectClassInfo.getC();
} else if (object instanceof SkriptPotionEffect) { // compatibility: treat SkriptPotionEffect the same as PotionEffect
objectClass = PotionEffect.class;
} else {
return Relation.NOT_EQUAL;
}
//noinspection unchecked
return Relation.get(classInfo.getC().isAssignableFrom(objectClass));
});

// DamageCause - ItemType
Expand Down
2 changes: 2 additions & 0 deletions src/test/skript/tests/bukkit/potion module.sk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ test "potion effect creation":
assert amplifier of {_potion} is 5 with "amplifier is not 5"
assert {_potion} is infinite with "potion is infinite"

assert {_potion} is a potion effect with "potion effect is not a potion effect"

# ExprPotionEffects
test "potion effects of entities/items":
# setup
Expand Down
Loading