From 105e12db10023ff555932c2b4618bfcf38b6f42f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 23 Jan 2015 00:25:39 +0100 Subject: [PATCH] * Fixed AddManaOfAnyColorEffect to send TAPPED_FOR_MANA event correctly (fixed that City of Brass did not work with Heartbeat of Spring). --- Mage/src/mage/abilities/AbilityImpl.java | 2 +- .../mage/abilities/effects/common/AddManaOfAnyColorEffect.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java index 5a5543667b..891e0d01ed 100644 --- a/Mage/src/mage/abilities/AbilityImpl.java +++ b/Mage/src/mage/abilities/AbilityImpl.java @@ -359,7 +359,7 @@ public abstract class AbilityImpl implements Ability { } else if (effect instanceof DynamicManaEffect) { mana = ((DynamicManaEffect)effect).getMana(game, this); } - if (mana != null) { // if mana == null the event has to be fires in the mana effect + if (mana != null) { // if mana == null the event has to be fired in the mana effect game.fireEvent(new ManaEvent(GameEvent.EventType.TAPPED_FOR_MANA, sourceId, sourceId, controllerId, mana)); } break; diff --git a/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java b/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java index 55ff35d170..5a080336e7 100644 --- a/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java +++ b/Mage/src/mage/abilities/effects/common/AddManaOfAnyColorEffect.java @@ -73,7 +73,7 @@ public class AddManaOfAnyColorEffect extends BasicManaEffect { if (controller.choose(outcome, choice, game)) { if (choice.getColor() == null) { - return false; // it happenes, don't know how + return false; // it happens, don't know how } Mana createdMana = null; if (choice.getColor().isBlack()) { @@ -89,6 +89,7 @@ public class AddManaOfAnyColorEffect extends BasicManaEffect { } if (createdMana != null) { controller.getManaPool().addMana(createdMana, game, source); + checkToFirePossibleEvents(createdMana, game, source); } return true; }