github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3280 from ingmargoudt/quicksilver_fountain

Browse source 
fix for quicksilver fountain, as it let you target all lands in play …
This commit is contained in:
Derek M 2017-04-30 12:47:22 -04:00 committed by GitHub
commit 5bfd84f6ac
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage.Sets/src/mage/cards/q/QuicksilverFountain.java
View file

@ -27,7 +27,6 @@
*/
package mage.cards.q;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@ -38,12 +37,9 @@ import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.BecomesBasicLandTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SubtypePredicate;
@ -51,9 +47,11 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetLandPermanent;
import mage.target.TargetPermanent;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
/**
*
* @author jeffwadsworth
@ -84,7 +82,7 @@ public class QuicksilverFountain extends CardImpl {
class QuicksilverFountainEffect extends OneShotEffect {
static final private FilterLandPermanent filterNonIslandLand = new FilterLandPermanent("non-Island land");
static final private FilterControlledLandPermanent filterNonIslandLand = new FilterControlledLandPermanent("non-Island land");
static {
filterNonIslandLand.add(Predicates.not(new SubtypePredicate("Island")));
@ -102,7 +100,7 @@ class QuicksilverFountainEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
Target targetNonIslandLand = new TargetLandPermanent(filterNonIslandLand);
Target targetNonIslandLand = new TargetPermanent(filterNonIslandLand);
if (player != null) {
if (player.choose(Outcome.Neutral, targetNonIslandLand, source.getId(), game)) {
Permanent landChosen = game.getPermanent(targetNonIslandLand.getFirstTarget());