github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Myr Superion - Fixed that its mana costs could not be decreased by convoke.

Browse source
This commit is contained in:
LevelX2 2016-04-24 12:34:35 +02:00
parent ea0b13c64f
commit d626b072cd
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java
View file

@ -35,7 +35,7 @@ import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterCreatureCard;
import mage.filter.common.FilterCreaturePermanent;
/**
*
@ -43,7 +43,7 @@ import mage.filter.common.FilterCreatureCard;
*/
public class MyrSuperion extends CardImpl {
private static FilterCreatureCard filter = new FilterCreatureCard();
private static FilterCreaturePermanent filter = new FilterCreaturePermanent();
public MyrSuperion(UUID ownerId) {
super(ownerId, 146, "Myr Superion", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}");

6
Mage/src/main/java/mage/players/ManaPool.java
View file

@ -47,6 +47,7 @@ import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.events.ManaEvent;
import mage.game.stack.Spell;
/**
*
@ -130,7 +131,10 @@ public class ManaPool implements Serializable {
for (ManaPoolItem mana : manaItems) {
if (filter != null) {
if (!filter.match(mana.getSourceObject(), game)) {
continue;
// Prevent that cost reduction by convoke is filtered out
if (!(mana.getSourceObject() instanceof Spell) || ability.getSourceId().equals(mana.getSourceId())) {
continue;
}
}
}
if (!manaType.equals(unlockedManaType) && autoPayment && autoPaymentRestricted && mana.count() == mana.getStock()) {