diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 08508d6f4..ecaceabe1 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -684,6 +684,9 @@ MTGAbility * AbilityFactory::getCoreAbility(MTGAbility * a) if (MultiAbility * abi = dynamic_cast(a)) return getCoreAbility(abi->abilities[0]); + if (NestedAbility * na = dynamic_cast (a)) + return getCoreAbility(na->ability); + return a; } @@ -2568,6 +2571,11 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card, int } else { + // Anything involving Mana Producing abilities cannot be interrupted + MTGAbility * core = getCoreAbility(a); + if (AManaProducer * amp = dynamic_cast (core)) + a->canBeInterrupted = false; + a->addToGame(); } }