github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-01-08 18:11:55 +01:00
commit 77f64e3e16
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/cards/d/DefiantSalvager.java
View file

@ -38,7 +38,8 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.target.common.TargetControlledPermanent;
@ -48,10 +49,10 @@ import mage.target.common.TargetControlledPermanent;
*/
public class DefiantSalvager extends CardImpl {
private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an artifact or creature");
private final static FilterControlledPermanent filter = new FilterControlledPermanent("an artifact or creature");
static {
filter.add(new CardTypePredicate(CardType.ARTIFACT));
filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.CREATURE)));
}
public DefiantSalvager(UUID ownerId, CardSetInfo setInfo) {