From 7dbbac4da39994b732cdee298434efcd6f043562 Mon Sep 17 00:00:00 2001 From: Plopman Date: Fri, 28 Jun 2013 22:25:22 +0200 Subject: [PATCH] Added subtye parameter to FilterCreaturePermanent and FilterControlledCreaturePermanent --- .../filter/common/FilterControlledCreaturePermanent.java | 8 ++++++++ Mage/src/mage/filter/common/FilterCreaturePermanent.java | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java b/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java index 4d69b6393db..5831922c2f3 100644 --- a/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java +++ b/Mage/src/mage/filter/common/FilterControlledCreaturePermanent.java @@ -30,6 +30,7 @@ package mage.filter.common; import mage.constants.CardType; import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -44,6 +45,13 @@ public class FilterControlledCreaturePermanent extends FilterControlledPermanent public FilterControlledCreaturePermanent(String name) { super(name); this.add(new CardTypePredicate(CardType.CREATURE)); + } + + + public FilterControlledCreaturePermanent(String subtype, String name) { + super(name); + this.add(new CardTypePredicate(CardType.CREATURE)); + this.add(new SubtypePredicate(subtype)); } public FilterControlledCreaturePermanent(final FilterControlledCreaturePermanent filter) { diff --git a/Mage/src/mage/filter/common/FilterCreaturePermanent.java b/Mage/src/mage/filter/common/FilterCreaturePermanent.java index b23a54be977..1f397f9dd07 100644 --- a/Mage/src/mage/filter/common/FilterCreaturePermanent.java +++ b/Mage/src/mage/filter/common/FilterCreaturePermanent.java @@ -31,6 +31,7 @@ package mage.filter.common; import mage.constants.CardType; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.filter.predicate.mageobject.SubtypePredicate; /** * @@ -45,6 +46,12 @@ public class FilterCreaturePermanent extends FilterPermanent { public FilterCreaturePermanent(String name) { super(name); this.add(new CardTypePredicate(CardType.CREATURE)); + } + + public FilterCreaturePermanent(String name, String subtype) { + super(name); + this.add(new CardTypePredicate(CardType.CREATURE)); + this.add(new SubtypePredicate(subtype)); } public FilterCreaturePermanent(final FilterCreaturePermanent filter) {