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

fixed redundant optional checks for Decree of Justice

Browse source
This commit is contained in:
Evan Kranzler 2020-04-29 21:45:29 -04:00
parent c7140d1ace
commit 0c1fbe786a
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Mage.Sets/src/mage/cards/d/DecreeOfJustice.java
View file

@ -14,7 +14,6 @@ import mage.constants.Outcome;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.token.AngelToken; import mage.game.permanent.token.AngelToken;
import mage.game.permanent.token.SoldierToken; import mage.game.permanent.token.SoldierToken;
import mage.game.permanent.token.Token;
import mage.players.Player; import mage.players.Player;
import mage.util.ManaUtil; import mage.util.ManaUtil;
@ -35,11 +34,11 @@ public final class DecreeOfJustice extends CardImpl {
this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{W}"))); this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{W}")));
// When you cycle Decree of Justice, you may pay {X}. If you do, create X 1/1 white Soldier creature tokens. // When you cycle Decree of Justice, you may pay {X}. If you do, create X 1/1 white Soldier creature tokens.
Ability ability = new CycleTriggeredAbility(new DecreeOfJusticeCycleEffect(), true); Ability ability = new CycleTriggeredAbility(new DecreeOfJusticeCycleEffect());
this.addAbility(ability); this.addAbility(ability);
} }
public DecreeOfJustice(final DecreeOfJustice card) { private DecreeOfJustice(final DecreeOfJustice card) {
super(card); super(card);
} }
@ -56,7 +55,7 @@ class DecreeOfJusticeCycleEffect extends OneShotEffect {
this.staticText = "you may pay {X}. If you do, create X 1/1 white Soldier creature tokens"; this.staticText = "you may pay {X}. If you do, create X 1/1 white Soldier creature tokens";
} }
DecreeOfJusticeCycleEffect(final DecreeOfJusticeCycleEffect effect) { private DecreeOfJusticeCycleEffect(final DecreeOfJusticeCycleEffect effect) {
super(effect); super(effect);
} }
@ -68,14 +67,12 @@ class DecreeOfJusticeCycleEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
if (player != null && player.chooseUse(Outcome.Benefit, "Do you want to pay {X} to create X tokens?", source, game)) { if (player == null || !player.chooseUse(Outcome.Benefit, "Pay {X} to create X tokens?", source, game)) {
int payCount = ManaUtil.playerPaysXGenericMana(true, "Decree of Justice", player, source, game); return false;
if (payCount > 0) { }
Token token = new SoldierToken(); int payCount = ManaUtil.playerPaysXGenericMana(true, "Decree of Justice", player, source, game);
token.putOntoBattlefield(payCount, game, source.getSourceId(), source.getControllerId()); if (payCount > 0) {
return true; return new SoldierToken().putOntoBattlefield(payCount, game, source.getSourceId(), source.getControllerId());
}
} }
return false; return false;
} }