External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 04:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: added verify test to check miss of controlled filter in equip abilities (related to #11473);

Browse source
This commit is contained in:
Oleg Agafonov 2023-11-27 23:08:23 +04:00
parent a4c90d9b71
commit 3a92d67d10
9 changed files with 68 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/effects/ContinuousEffectImpl.java
View file

@ -452,7 +452,7 @@ public abstract class ContinuousEffectImpl extends EffectImpl implements Continu
// wait dependency
// extraPredicates from some filters is player related, you don't need it here
List<Predicate> list = new ArrayList<>();
Predicates.collectAllComponents(filter.getPredicates(), list);
Predicates.collectAllComponents(filter.getPredicates(), filter.getExtraPredicates(), list);
if (list.stream().anyMatch(SubType.SubTypePredicate.class::isInstance)) {
this.addDependedToType(DependencyType.AddingCreatureType);
}

9
Mage/src/main/java/mage/constants/TargetController.java
View file

@ -182,7 +182,14 @@ public enum TargetController {
@Override
public String toString() {
return "TargetController(" + controller.toString() + ')';
return "TargetController (" + controller.toString() + ')';
}
/**
* For tests
*/
public TargetController getController() {
return this.controller;
}
}
}

5
Mage/src/main/java/mage/filter/Filter.java
View file

@ -5,6 +5,7 @@ import mage.game.Game;
import mage.util.Copyable;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -35,4 +36,8 @@ public interface Filter<E> extends Serializable, Copyable<Filter<E>> {
public void setLockedFilter(boolean lockedFilter);
List<Predicate<? super E>> getPredicates();
default List<Predicate> getExtraPredicates() {
return new ArrayList<>();
}
}

7
Mage/src/main/java/mage/filter/FilterCard.java
View file

@ -91,12 +91,17 @@ public class FilterCard extends FilterObject<Card> {
return new FilterCard(this);
}
@Override
public List<Predicate> getExtraPredicates() {
return new ArrayList<>(extraPredicates);
}
public static void checkPredicateIsSuitableForCardFilter(Predicate predicate) {
// card filter can't contain controller predicate (only permanents on battlefield have controller)
List<Predicate> list = new ArrayList<>();
Predicates.collectAllComponents(predicate, list);
if (list.stream().anyMatch(TargetController.ControllerPredicate.class::isInstance)) {
throw new IllegalArgumentException("Card filter doesn't support controller predicate");
throw new IllegalArgumentException("Wrong code usage: card filter doesn't support controller predicate");
}
}

7
Mage/src/main/java/mage/filter/FilterPermanent.java
View file

@ -4,6 +4,7 @@ import mage.abilities.Ability;
import mage.constants.SubType;
import mage.filter.predicate.ObjectSourcePlayer;
import mage.filter.predicate.ObjectSourcePlayerPredicate;
import mage.filter.predicate.Predicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -11,6 +12,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
/**
* @author North
@ -69,4 +71,9 @@ public class FilterPermanent extends FilterObject<Permanent> implements FilterIn
public FilterPermanent copy() {
return new FilterPermanent(this);
}
@Override
public List<Predicate> getExtraPredicates() {
return new ArrayList<>(extraPredicates);
}
}

6
Mage/src/main/java/mage/filter/FilterPlayer.java
View file

@ -3,6 +3,7 @@ package mage.filter;
import mage.abilities.Ability;
import mage.filter.predicate.ObjectSourcePlayer;
import mage.filter.predicate.ObjectSourcePlayerPredicate;
import mage.filter.predicate.Predicate;
import mage.game.Game;
import mage.players.Player;
@ -56,4 +57,9 @@ public class FilterPlayer extends FilterImpl<Player> {
public FilterPlayer copy() {
return new FilterPlayer(this);
}
@Override
public List<Predicate> getExtraPredicates() {
return new ArrayList<>(extraPredicates);
}
}

6
Mage/src/main/java/mage/filter/FilterStackObject.java
View file

@ -3,6 +3,7 @@ package mage.filter;
import mage.abilities.Ability;
import mage.filter.predicate.ObjectSourcePlayer;
import mage.filter.predicate.ObjectSourcePlayerPredicate;
import mage.filter.predicate.Predicate;
import mage.game.Game;
import mage.game.stack.StackObject;
@ -49,4 +50,9 @@ public class FilterStackObject extends FilterObject<StackObject> {
public FilterStackObject copy() {
return new FilterStackObject(this);
}
@Override
public List<Predicate> getExtraPredicates() {
return new ArrayList<>(extraPredicates);
}
}

13
Mage/src/main/java/mage/filter/predicate/Predicates.java
View file

@ -232,17 +232,18 @@ public final class Predicates {
if (predicate instanceof NotPredicate) {
collectAllComponents(((NotPredicate) predicate).predicate, res);
} else if (predicate instanceof AndPredicate) {
collectAllComponents(((AndPredicate) predicate).components, res);
collectAllComponents(((AndPredicate) predicate).components, null, res);
} else if (predicate instanceof OrPredicate) {
collectAllComponents(((OrPredicate) predicate).components, res);
collectAllComponents(((OrPredicate) predicate).components, null, res);
} else {
res.add(predicate);
}
}
public static void collectAllComponents(List<Predicate> predicates, List<Predicate> res) {
predicates.forEach(p -> {
collectAllComponents(p, res);
});
public static void collectAllComponents(List<Predicate> predicates, List<Predicate> extraPredicates, List<Predicate> res) {
predicates.forEach(p -> collectAllComponents(p, res));
if (extraPredicates != null) {
extraPredicates.forEach(p -> collectAllComponents(p, res));
}
}
}