External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 03:22:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Some minor changes.

Browse source
This commit is contained in:
LevelX2 2017-12-03 17:39:00 +01:00
parent 26a45dd951
commit ab8bcd92c2
2 changed files with 108 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/a/ApocalypseDemon.java
View file

@ -39,7 +39,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
@ -52,7 +51,6 @@ public class ApocalypseDemon extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature"); private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature");
static { static {
filter.add(new CardTypePredicate(CardType.CREATURE));
filter.add(new AnotherPredicate()); filter.add(new AnotherPredicate());
} }
@ -76,6 +74,7 @@ public class ApocalypseDemon extends CardImpl {
super(card); super(card);
} }
@Override
public ApocalypseDemon copy() { public ApocalypseDemon copy() {
return new ApocalypseDemon(this); return new ApocalypseDemon(this);
} }

2
Mage.Tests/src/test/java/org/mage/test/cards/modal/OneOrBothTest.java
View file

@ -101,7 +101,7 @@ public class OneOrBothTest extends CardTestPlayerBase {
setStopAt(1, PhaseStep.BEGIN_COMBAT); setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute(); execute();
assertPowerToughness(playerA, "Silvercoat Lion", 3, 3);
assertPowerToughness(playerB, "Pillarfield Ox", 1, 3); assertPowerToughness(playerB, "Pillarfield Ox", 1, 3);
assertPowerToughness(playerA, "Silvercoat Lion", 3, 3);
} }
} }