Skip to content

Commit 804377d

Browse files
committed
Update PatternConflictsTest.java
1 parent a1ea83a commit 804377d

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

src/test/java/ch/njol/skript/patterns/PatternConflictsTest.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
import ch.njol.skript.Skript;
44
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.*;
106
import ch.njol.skript.effects.EffScriptFile;
117
import ch.njol.skript.effects.EffWorldLoad;
128
import ch.njol.skript.expressions.*;
@@ -19,18 +15,12 @@
1915
import org.junit.Assert;
2016
import org.junit.Test;
2117
import org.skriptlang.skript.bukkit.potion.elements.conditions.CondHasPotion;
18+
import org.skriptlang.skript.common.properties.conditions.PropCondContains;
2219
import org.skriptlang.skript.lang.structure.Structure;
2320
import org.skriptlang.skript.registration.SyntaxInfo;
2421

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.*;
3223
import java.util.Map.Entry;
33-
import java.util.Set;
3424
import java.util.concurrent.atomic.AtomicInteger;
3525
import java.util.stream.Collectors;
3626

@@ -445,6 +435,7 @@ private boolean exclude(List<Combination> combinations) {
445435
EXCLUSIONS.add(new Exclusion(ExprEntities.class, ExprItemsIn.class));
446436
// CondContains takes precedence over CondHasPotion in the case of "{_x} has {_y}"
447437
EXCLUSIONS.add(new Exclusion(CondContains.class, CondHasPotion.class));
438+
EXCLUSIONS.add(new Exclusion(PropCondContains.class, CondHasPotion.class));
448439

449440
// 8 conflicts
450441
EXCLUSIONS.add(new Exclusion(CondScriptLoaded.class, CondIsLoaded.class));

0 commit comments

Comments
 (0)