From e5437643c8b34eaa6e7adc15ca8b5c300ed9de4d Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 23 Mar 2015 01:09:53 +0100 Subject: [PATCH] * Convoke - Fixed that it was not possible to pay with convoke mana costs containing no colorless mana. --- Mage/src/mage/abilities/effects/common/GainLifeEffect.java | 7 +------ Mage/src/mage/abilities/keyword/ConvokeAbility.java | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java b/Mage/src/mage/abilities/effects/common/GainLifeEffect.java index e5d3f87107e..064edd652aa 100644 --- a/Mage/src/mage/abilities/effects/common/GainLifeEffect.java +++ b/Mage/src/mage/abilities/effects/common/GainLifeEffect.java @@ -85,12 +85,7 @@ public class GainLifeEffect extends OneShotEffect { } StringBuilder sb = new StringBuilder(); String message = life.getMessage(); - - if (sb.length() > 0) { - sb.append("you gain "); - } else { - sb.append("You gain "); - } + sb.append("you gain "); if (message.isEmpty() || !message.equals("1")) { sb.append(life).append(" "); } diff --git a/Mage/src/mage/abilities/keyword/ConvokeAbility.java b/Mage/src/mage/abilities/keyword/ConvokeAbility.java index e6f15786148..b4c77133785 100644 --- a/Mage/src/mage/abilities/keyword/ConvokeAbility.java +++ b/Mage/src/mage/abilities/keyword/ConvokeAbility.java @@ -115,7 +115,7 @@ public class ConvokeAbility extends SimpleStaticAbility implements AlternateMana public void addSpecialAction(Ability source, Game game, ManaCost unpaid) { Player controller = game.getPlayer(source.getControllerId()); if (controller != null && game.getBattlefield().contains(filterUntapped, controller.getId(), 1, game)) { - if (unpaid.getMana().getColorless() > 0 && source.getAbilityType().equals(AbilityType.SPELL)) { + if (source.getAbilityType().equals(AbilityType.SPELL)) { SpecialAction specialAction = new ConvokeSpecialAction(unpaid); specialAction.setControllerId(source.getControllerId()); specialAction.setSourceId(source.getSourceId());