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

* Early Harvest - Fixed that wrongly all lands were untapped instead of only basic lands.

Browse source
This commit is contained in:
LevelX2 2015-05-05 09:57:21 +02:00
parent 65c30c0f61
commit 780611541d
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage.Sets/src/mage/sets/ninthedition/EarlyHarvest.java
View file

@ -35,6 +35,8 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -50,8 +52,6 @@ public class EarlyHarvest extends CardImpl {
super(ownerId, 235, "Early Harvest", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{G}{G}");
this.expansionSetCode = "9ED";
this.color.setGreen(true);
// Target player untaps all basic lands he or she controls.
this.getSpellAbility().addEffect(new UntapAllLandsTargetEffect());
this.getSpellAbility().addTarget(new TargetPlayer());
@ -68,7 +68,12 @@ public class EarlyHarvest extends CardImpl {
}
class UntapAllLandsTargetEffect extends OneShotEffect {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(Predicates.not(new SupertypePredicate("Basic")));
}
public UntapAllLandsTargetEffect() {
super(Outcome.Untap);
staticText = "Target player untaps all basic lands he or she controls";
@ -82,7 +87,7 @@ class UntapAllLandsTargetEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(this.getTargetPointer().getFirst(game, source));
if (player != null) {
for (Permanent land: game.getBattlefield().getAllActivePermanents(new FilterLandPermanent(), player.getId(), game)) {
for (Permanent land: game.getBattlefield().getAllActivePermanents(filter, player.getId(), game)) {
land.untap(game);
}
return true;
@ -95,4 +100,4 @@ class UntapAllLandsTargetEffect extends OneShotEffect {
return new UntapAllLandsTargetEffect(this);
}
}
}