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

Fixed Nazahn not properly searching for his Hammer.

Browse source
This commit is contained in:
Evan Kranzler 2017-08-27 08:07:57 -04:00
parent a8105e1c60
commit 962ec40d4c
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java
View file

@ -103,21 +103,15 @@ public class SearchLibraryPutInHandOrOnBattlefieldEffect extends SearchEffect {
if (card.getName().equals(nameToPutOnBattlefield)) { if (card.getName().equals(nameToPutOnBattlefield)) {
askToPutOntoBf = true; askToPutOntoBf = true;
cardToPutOnBf = card; cardToPutOnBf = card;
} else { }
cards.add(card); cards.add(card);
} }
} }
} if (askToPutOntoBf && controller.chooseUse(Outcome.PutCardInPlay, "Put " + cardToPutOnBf.getLogName() + " onto the battlefield instead?", source, game)) {
if (askToPutOntoBf && cardToPutOnBf != null) {
if (controller.chooseUse(Outcome.PutCardInPlay, "Put " + cardToPutOnBf.getLogName() + " onto the battlefield instead?", source, game)) {
controller.moveCards(cards, Zone.BATTLEFIELD, source, game); controller.moveCards(cards, Zone.BATTLEFIELD, source, game);
} else { } else {
controller.moveCards(cards, Zone.HAND, source, game); controller.moveCards(cards, Zone.HAND, source, game);
} }
} else {
controller.moveCards(cards, Zone.HAND, source, game);
}
if (revealCards) { if (revealCards) {
String name = "Reveal"; String name = "Reveal";
Card sourceCard = game.getCard(source.getSourceId()); Card sourceCard = game.getCard(source.getSourceId());
@ -146,7 +140,9 @@ public class SearchLibraryPutInHandOrOnBattlefieldEffect extends SearchEffect {
sb.append("a ").append(target.getTargetName()).append(revealCards ? ", reveal it," : "").append(" and put that card into your hand"); sb.append("a ").append(target.getTargetName()).append(revealCards ? ", reveal it," : "").append(" and put that card into your hand");
} }
if (nameToPutOnBattlefield != null) { if (nameToPutOnBattlefield != null) {
sb.append(". If you reveal a card named " + nameToPutOnBattlefield + " you may put it onto the battlefield instead"); sb.append(". If you reveal a card named ");
sb.append(nameToPutOnBattlefield);
sb.append("this way, you may put it onto the battlefield instead");
} }
if (forceShuffle) { if (forceShuffle) {
sb.append(". Then shuffle your library"); sb.append(". Then shuffle your library");