minor fixes

This commit is contained in:
North 2012-08-26 15:24:36 +03:00
parent 9c7caf3c0e
commit d46678f95f
2 changed files with 15 additions and 13 deletions

View file

@ -63,7 +63,7 @@ public class DivineReckoning extends CardImpl<DivineReckoning> {
this.getSpellAbility().addEffect(new DivineReckoningEffect()); this.getSpellAbility().addEffect(new DivineReckoningEffect());
// Flashback {5}{W}{W} // Flashback {5}{W}{W}
this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{W}{W}"), Constants.TimingRule.INSTANT)); this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{W}{W}"), Constants.TimingRule.SORCERY));
} }
public DivineReckoning(final DivineReckoning card) { public DivineReckoning(final DivineReckoning card) {

View file

@ -41,9 +41,9 @@ import mage.abilities.effects.OneShotEffect;
import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPlayer; import mage.target.TargetPlayer;
/** /**
@ -84,7 +84,7 @@ class DawnglareInvokerEffect extends OneShotEffect<DawnglareInvokerEffect> {
public DawnglareInvokerEffect() { public DawnglareInvokerEffect() {
super(Outcome.Tap); super(Outcome.Tap);
staticText = "Tap all creatures target player controls."; staticText = "Tap all creatures target player controls";
} }
public DawnglareInvokerEffect(final DawnglareInvokerEffect effect) { public DawnglareInvokerEffect(final DawnglareInvokerEffect effect) {
@ -93,20 +93,22 @@ class DawnglareInvokerEffect extends OneShotEffect<DawnglareInvokerEffect> {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getFirstTarget()); if (source.getFirstTarget() == null) {
if (player != null) { return false;
List<Permanent> allCreatures = game.getBattlefield().getAllActivePermanents(new FilterCreaturePermanent(), player.getId(), game); }
for (Permanent creature : allCreatures) {
FilterCreaturePermanent filter = new FilterCreaturePermanent();
filter.add(new ControllerIdPredicate(source.getFirstTarget()));
List<Permanent> creatures = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
for (Permanent creature : creatures) {
creature.tap(game); creature.tap(game);
} }
return true; return true;
} }
return false;
}
@Override @Override
public DawnglareInvokerEffect copy() { public DawnglareInvokerEffect copy() {
return new DawnglareInvokerEffect(this); return new DawnglareInvokerEffect(this);
} }
} }