Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Commanders improves:

Browse source 
* [KHM] fixed that some effects can't find mdf commanders on battlefield (example: Fierce Guardianship, #7504);
* Oathbreaker: fixed that some cards that refer to commander can affects signature spells too;
This commit is contained in:
Oleg Agafonov 2021-02-05 17:19:30 +04:00
parent 62cad8e850
commit dc0a29007c
34 changed files with 293 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/main/java/mage/target/TargetCard.java
View file

@ -4,10 +4,10 @@ import mage.MageItem;
import mage.abilities.Ability;
import mage.cards.Card;
import mage.cards.Cards;
import mage.constants.CommanderCardType;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.TargetEvent;
import mage.players.Player;
@ -115,6 +115,22 @@ public class TargetCard extends TargetObject {
}
}
break;
case COMMAND:
List<Card> possibleCards = game.getCommandersIds(player, CommanderCardType.ANY, false).stream()
.map(game::getCard)
.filter(Objects::nonNull)
.filter(card -> game.getState().getZone(card.getId()).equals(Zone.COMMAND))
.filter(card -> filter.match(card, sourceId, sourceControllerId, game))
.collect(Collectors.toList());
for (Card card : possibleCards) {
if (sourceId == null || isNotTarget() || !game.replaceEvent(new TargetEvent(card, sourceId, sourceControllerId))) {
possibleTargets++;
if (possibleTargets >= this.minNumberOfTargets) {
return true;
}
}
}
break;
}
}
}
@ -173,7 +189,7 @@ public class TargetCard extends TargetObject {
}
break;
case COMMAND:
List<Card> possibleCards = game.getCommandersIds(player).stream()
List<Card> possibleCards = game.getCommandersIds(player, CommanderCardType.ANY, false).stream()
.map(game::getCard)
.filter(Objects::nonNull)
.filter(card -> game.getState().getZone(card.getId()).equals(Zone.COMMAND))