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

27
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -1893,8 +1893,9 @@ public abstract class GameImpl implements Game, Serializable {
// If a commander is in a graveyard or in exile and that card was put into that zone
// since the last time state-based actions were checked, its owner may put it into the command zone.
// signature spells goes to command zone all the time
for (Player player : state.getPlayers().values()) {
Set<UUID> commanderIds = getCommandersIds(player, CommanderCardType.COMMANDER_OR_OATHBREAKER);
Set<UUID> commanderIds = getCommandersIds(player, CommanderCardType.COMMANDER_OR_OATHBREAKER, false);
if (commanderIds.isEmpty()) {
continue;
}
@ -3419,8 +3420,28 @@ public abstract class GameImpl implements Game, Serializable {
}
@Override
public Set<UUID> getCommandersIds(Player player, CommanderCardType commanderCardType) {
return player.getCommandersIds();
public Set<UUID> getCommandersIds(Player player, CommanderCardType commanderCardType, boolean returnAllCardParts) {
//noinspection deprecation - it's ok to use it in inner method
Set<UUID> mainCards = player.getCommandersIds();
return filterCommandersBySearchZone(mainCards, returnAllCardParts);
}
final protected Set<UUID> filterCommandersBySearchZone(Set<UUID> commanderMainCards, boolean returnAllCardParts) {
// filter by zone search (example: if you search commanders on battlefield then must see all sides of mdf cards)
Set<UUID> filteredCards = new HashSet<>();
if (returnAllCardParts) {
// need all card parts
commanderMainCards.stream()
.map(this::getCard)
.filter(Objects::nonNull)
.forEach(card -> {
filteredCards.addAll(CardUtil.getObjectParts(card));
});
} else {
filteredCards.addAll(commanderMainCards);
}
return filteredCards;
}
@Override