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

* Convoke - Fixed that it was not possible to pay with convoke mana costs containing no colorless mana.

Browse source
This commit is contained in:
LevelX2 2015-03-23 01:09:53 +01:00
parent 0b20004d97
commit e5437643c8
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/mage/abilities/effects/common/GainLifeEffect.java
View file

@ -85,12 +85,7 @@ public class GainLifeEffect extends OneShotEffect {
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
String message = life.getMessage(); String message = life.getMessage();
sb.append("you gain ");
if (sb.length() > 0) {
sb.append("you gain ");
} else {
sb.append("You gain ");
}
if (message.isEmpty() || !message.equals("1")) { if (message.isEmpty() || !message.equals("1")) {
sb.append(life).append(" "); sb.append(life).append(" ");
} }

2
Mage/src/mage/abilities/keyword/ConvokeAbility.java
View file

@ -115,7 +115,7 @@ public class ConvokeAbility extends SimpleStaticAbility implements AlternateMana
public void addSpecialAction(Ability source, Game game, ManaCost unpaid) { public void addSpecialAction(Ability source, Game game, ManaCost unpaid) {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (controller != null && game.getBattlefield().contains(filterUntapped, controller.getId(), 1, game)) { 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 specialAction = new ConvokeSpecialAction(unpaid);
specialAction.setControllerId(source.getControllerId()); specialAction.setControllerId(source.getControllerId());
specialAction.setSourceId(source.getSourceId()); specialAction.setSourceId(source.getSourceId());