Skip to content

Commit 4cc2096

Browse files
committed
Fix skript-reflect breaking the vanilla "fire visual effect comparison" test
1 parent 69c0daa commit 4cc2096

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/main/java/com/btk5h/skriptmirror/SkriptMirror.java

+11-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import ch.njol.skript.Skript;
44
import ch.njol.skript.SkriptAddon;
5-
import ch.njol.skript.lang.parser.ParserInstance;
5+
import ch.njol.skript.classes.ClassInfo;
6+
import ch.njol.skript.registrations.Classes;
67
import ch.njol.skript.util.Version;
78
import org.skriptlang.reflect.syntax.condition.elements.StructCustomCondition;
89
import org.skriptlang.reflect.syntax.effect.elements.StructCustomEffect;
@@ -14,6 +15,8 @@
1415
import com.btk5h.skriptmirror.util.SkriptReflection;
1516
import org.bukkit.Bukkit;
1617
import org.bukkit.plugin.java.JavaPlugin;
18+
import org.skriptlang.skript.lang.comparator.Comparators;
19+
import org.skriptlang.skript.lang.comparator.Relation;
1720

1821
import java.io.IOException;
1922
import java.nio.file.Path;
@@ -64,6 +67,13 @@ public void onEnable() {
6467
e.printStackTrace();
6568
}
6669

70+
Comparators.registerComparator(ClassInfo.class, JavaType.class, (classInfo, javaType) -> {
71+
ClassInfo<?> matchingClassInfo = Classes.getExactClassInfo(javaType.getJavaClass());
72+
if (matchingClassInfo == null)
73+
return Relation.NOT_EQUAL;
74+
return Comparators.compare(classInfo, matchingClassInfo);
75+
});
76+
6777
ParseOrderWorkarounds.reorderSyntax();
6878

6979
// Disable *all* and/or warnings

0 commit comments

Comments
 (0)