mirror of
https://github.com/correl/mage.git
synced 2025-03-16 09:16:26 -09:00
Minor formatting.
This commit is contained in:
parent
721a411aad
commit
19714312cd
3 changed files with 12 additions and 6 deletions
|
@ -114,10 +114,12 @@ class PastInFlamesEffect extends ContinuousEffectImpl<PastInFlamesEffect> {
|
||||||
if (objects.contains(cardId)) {
|
if (objects.contains(cardId)) {
|
||||||
Card card = game.getCard(cardId);
|
Card card = game.getCard(cardId);
|
||||||
FlashbackAbility ability = null;
|
FlashbackAbility ability = null;
|
||||||
if (card.getCardType().contains(CardType.INSTANT))
|
if (card.getCardType().contains(CardType.INSTANT)) {
|
||||||
ability = new FlashbackAbility(card.getManaCost(), TimingRule.INSTANT);
|
ability = new FlashbackAbility(card.getManaCost(), TimingRule.INSTANT);
|
||||||
else if (card.getCardType().contains(CardType.SORCERY))
|
}
|
||||||
|
else if (card.getCardType().contains(CardType.SORCERY)) {
|
||||||
ability = new FlashbackAbility(card.getManaCost(), TimingRule.SORCERY);
|
ability = new FlashbackAbility(card.getManaCost(), TimingRule.SORCERY);
|
||||||
|
}
|
||||||
if (ability != null) {
|
if (ability != null) {
|
||||||
ability.setSourceId(cardId);
|
ability.setSourceId(cardId);
|
||||||
ability.setControllerId(card.getOwnerId());
|
ability.setControllerId(card.getOwnerId());
|
||||||
|
|
|
@ -122,10 +122,12 @@ class SnapcasterMageEffect extends ContinuousEffectImpl<SnapcasterMageEffect> {
|
||||||
MageObject sourceObject = game.getObject(source.getSourceId());
|
MageObject sourceObject = game.getObject(source.getSourceId());
|
||||||
if (card != null && sourceObject != null) {
|
if (card != null && sourceObject != null) {
|
||||||
FlashbackAbility ability;
|
FlashbackAbility ability;
|
||||||
if (card.getCardType().contains(CardType.INSTANT))
|
if (card.getCardType().contains(CardType.INSTANT)) {
|
||||||
ability = new FlashbackAbility(card.getManaCost(), TimingRule.INSTANT);
|
ability = new FlashbackAbility(card.getManaCost(), TimingRule.INSTANT);
|
||||||
else
|
}
|
||||||
|
else {
|
||||||
ability = new FlashbackAbility(card.getManaCost(), TimingRule.SORCERY);
|
ability = new FlashbackAbility(card.getManaCost(), TimingRule.SORCERY);
|
||||||
|
}
|
||||||
ability.setSourceId(card.getId());
|
ability.setSourceId(card.getId());
|
||||||
ability.setControllerId(card.getOwnerId());
|
ability.setControllerId(card.getOwnerId());
|
||||||
game.getState().addOtherAbility(card.getId(), ability);
|
game.getState().addOtherAbility(card.getId(), ability);
|
||||||
|
|
|
@ -53,10 +53,12 @@ public class FirstCombatDamageStep extends Step<FirstCombatDamageStep> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean skipStep(Game game, UUID activePlayerId) {
|
public boolean skipStep(Game game, UUID activePlayerId) {
|
||||||
if (game.getCombat().noAttackers())
|
if (game.getCombat().noAttackers()) {
|
||||||
return true;
|
return true;
|
||||||
if (!game.getCombat().hasFirstOrDoubleStrike(game))
|
}
|
||||||
|
if (!game.getCombat().hasFirstOrDoubleStrike(game)) {
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
return super.skipStep(game, activePlayerId);
|
return super.skipStep(game, activePlayerId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue