From 90d516f15d3eba8c15c257f14822b37135f59bee Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 31 May 2014 10:48:03 +0200 Subject: [PATCH] * Stromgald Cabal - Fixed that he could counter blue spells instead of correctly white spells. --- Mage.Sets/src/mage/sets/iceage/Pyroblast.java | 17 ++++++++--------- .../src/mage/sets/iceage/StromgaldCabal.java | 2 +- .../effects/common/CounterTargetEffect.java | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/sets/iceage/Pyroblast.java b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java index 3f60f1b8853..cee0e018095 100644 --- a/Mage.Sets/src/mage/sets/iceage/Pyroblast.java +++ b/Mage.Sets/src/mage/sets/iceage/Pyroblast.java @@ -28,14 +28,13 @@ package mage.sets.iceage; import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Rarity; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Rarity; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; @@ -54,7 +53,7 @@ public class Pyroblast extends CardImpl { this.color.setRed(true); // Choose one - Counter target spell if it's blue; or destroy target permanent if it's blue. - this.getSpellAbility().addEffect(new CounterTargetEffect()); + this.getSpellAbility().addEffect(new PyroblastCounterTargetEffect()); this.getSpellAbility().addTarget(new TargetSpell()); Mode mode = new Mode(); @@ -74,19 +73,19 @@ public class Pyroblast extends CardImpl { } } -class CounterTargetEffect extends OneShotEffect { +class PyroblastCounterTargetEffect extends OneShotEffect { - public CounterTargetEffect() { + public PyroblastCounterTargetEffect() { super(Outcome.Detriment); } - public CounterTargetEffect(final CounterTargetEffect effect) { + public PyroblastCounterTargetEffect(final PyroblastCounterTargetEffect effect) { super(effect); } @Override - public CounterTargetEffect copy() { - return new CounterTargetEffect(this); + public PyroblastCounterTargetEffect copy() { + return new PyroblastCounterTargetEffect(this); } @Override diff --git a/Mage.Sets/src/mage/sets/iceage/StromgaldCabal.java b/Mage.Sets/src/mage/sets/iceage/StromgaldCabal.java index 8523c9b324c..3a28980b90d 100644 --- a/Mage.Sets/src/mage/sets/iceage/StromgaldCabal.java +++ b/Mage.Sets/src/mage/sets/iceage/StromgaldCabal.java @@ -27,7 +27,6 @@ */ package mage.sets.iceage; -import java.awt.Color; import java.util.UUID; import mage.MageInt; import mage.ObjectColor; @@ -35,6 +34,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.CounterTargetEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; diff --git a/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java b/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java index b0d764e2c9e..42f88354797 100644 --- a/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/CounterTargetEffect.java @@ -28,10 +28,10 @@ package mage.abilities.effects.common; import java.util.UUID; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; /**