|
2 | 2 |
|
3 | 3 | import ch.njol.skript.Skript; |
4 | 4 | import ch.njol.skript.SkriptAPIException; |
5 | | -import ch.njol.skript.conditions.CondCompare; |
6 | | -import ch.njol.skript.conditions.CondContains; |
7 | | -import ch.njol.skript.conditions.CondDate; |
8 | | -import ch.njol.skript.conditions.CondIsLoaded; |
9 | | -import ch.njol.skript.conditions.CondScriptLoaded; |
| 5 | +import ch.njol.skript.conditions.*; |
10 | 6 | import ch.njol.skript.effects.EffScriptFile; |
11 | 7 | import ch.njol.skript.effects.EffWorldLoad; |
12 | 8 | import ch.njol.skript.expressions.*; |
|
19 | 15 | import org.junit.Assert; |
20 | 16 | import org.junit.Test; |
21 | 17 | import org.skriptlang.skript.bukkit.potion.elements.conditions.CondHasPotion; |
| 18 | +import org.skriptlang.skript.common.properties.conditions.PropCondContains; |
22 | 19 | import org.skriptlang.skript.lang.structure.Structure; |
23 | 20 | import org.skriptlang.skript.registration.SyntaxInfo; |
24 | 21 |
|
25 | | -import java.util.ArrayList; |
26 | | -import java.util.Collection; |
27 | | -import java.util.HashMap; |
28 | | -import java.util.HashSet; |
29 | | -import java.util.Iterator; |
30 | | -import java.util.List; |
31 | | -import java.util.Map; |
| 22 | +import java.util.*; |
32 | 23 | import java.util.Map.Entry; |
33 | | -import java.util.Set; |
34 | 24 | import java.util.concurrent.atomic.AtomicInteger; |
35 | 25 | import java.util.stream.Collectors; |
36 | 26 |
|
@@ -445,6 +435,7 @@ private boolean exclude(List<Combination> combinations) { |
445 | 435 | EXCLUSIONS.add(new Exclusion(ExprEntities.class, ExprItemsIn.class)); |
446 | 436 | // CondContains takes precedence over CondHasPotion in the case of "{_x} has {_y}" |
447 | 437 | EXCLUSIONS.add(new Exclusion(CondContains.class, CondHasPotion.class)); |
| 438 | + EXCLUSIONS.add(new Exclusion(PropCondContains.class, CondHasPotion.class)); |
448 | 439 |
|
449 | 440 | // 8 conflicts |
450 | 441 | EXCLUSIONS.add(new Exclusion(CondScriptLoaded.class, CondIsLoaded.class)); |
|
0 commit comments