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

Refactor PutCards to address issue #9643 (#9644)

Browse source
This commit is contained in:
Alex W. Jackson 2022-10-14 01:07:14 -04:00 • committed by GitHub
parent 332db3aecb
commit 5e891f50c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 69 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
View file

@ -144,8 +144,8 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff
}
protected boolean actionWithPickedCards(Game game, Ability source, Player player, Cards pickedCards, Cards otherCards) {
boolean result = moveCards(game, source, player, pickedCards, putPickedCards);
result |= moveCards(game, source, player, otherCards, putLookedCards);
boolean result = putPickedCards.moveCards(player, pickedCards, source, game);
result |= putLookedCards.moveCards(player, otherCards, source, game);
return result;
}

17
Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java
View file

@ -82,22 +82,7 @@ public class LookLibraryControllerEffect extends OneShotEffect {
}
protected boolean actionWithLookedCards(Game game, Ability source, Player player, Cards cards) {
return moveCards(game, source, player, cards, putLookedCards);
}
protected static boolean moveCards(Game game, Ability source, Player player, Cards cards, PutCards putCards) {
switch (putCards) {
case TOP_ANY:
return player.putCardsOnTopOfLibrary(cards, game, source, true);
case BOTTOM_ANY:
return player.putCardsOnBottomOfLibrary(cards, game, source, true);
case BOTTOM_RANDOM:
return player.putCardsOnBottomOfLibrary(cards, game, source, false);
case BATTLEFIELD_TAPPED:
return player.moveCards(cards.getCards(game), Zone.BATTLEFIELD, source, game, true, false, false, null);
default:
return player.moveCards(cards, putCards.getZone(), source, game);
}
return putLookedCards.moveCards(player, cards, source, game);
}
@Override