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

Merge origin/master

Browse source
This commit is contained in:
Styxo 2016-12-15 15:37:49 +01:00
commit 1d989a70db
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/c/ConsulateCrackdown.java
View file

@ -77,7 +77,7 @@ class ConsulateCracksownExileEffect extends OneShotEffect {
private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts your opponents control"); private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(new ControllerPredicate(TargetController.OPPONENT));
} }
public ConsulateCracksownExileEffect() { public ConsulateCracksownExileEffect() {

5
Mage.Sets/src/mage/cards/e/EvolutionaryEscalation.java
View file

@ -39,6 +39,7 @@ import mage.constants.TargetController;
import mage.counters.Counter; import mage.counters.Counter;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.Target; import mage.target.Target;
@ -52,6 +53,10 @@ import mage.target.common.TargetCreaturePermanent;
public class EvolutionaryEscalation extends CardImpl { public class EvolutionaryEscalation extends CardImpl {
private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls");
static {
filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT));
}
public EvolutionaryEscalation(UUID ownerId, CardSetInfo setInfo) { public EvolutionaryEscalation(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");

2
Mage.Sets/src/mage/cards/e/EyeOfTheStorm.java
View file

@ -101,7 +101,7 @@ class EyeOfTheStormAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if (event.getZone() == Zone.HAND) { if (event.getZone() != Zone.OUTSIDE) {
Spell spell = game.getStack().getSpell(event.getTargetId()); Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && !spell.isCopy() if (spell != null && !spell.isCopy()
&& (spell.getCardType().contains(CardType.INSTANT) || spell.getCardType().contains(CardType.SORCERY))) { && (spell.getCardType().contains(CardType.INSTANT) || spell.getCardType().contains(CardType.SORCERY))) {