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

* Mishra, Artificer Prodigy - Fixed that artifact put into play with it's triggered ability where wrongly handled face down.

Browse source
This commit is contained in:
LevelX2 2015-09-04 14:33:27 +02:00
parent d6bed435e2
commit a1e385160a
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage.Sets/src/mage/sets/timespiral/MishraArtificerProdigy.java
View file

@ -142,15 +142,12 @@ class MishraArtificerProdigyEffect extends OneShotEffect {
FilterCard filter = new FilterCard("card named " + this.cardName);
filter.add(new NamePredicate(cardName));
Card card = null;
Zone zone = null;
// Graveyard
if (controller.chooseUse(Outcome.Neutral, "Search your graveyard?", source, game)) {
TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(0, 1, filter);
// You can't fail to find the card in your graveyard because it's not hidden
TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(1, 1, filter);
if (controller.choose(Outcome.PutCardInPlay, controller.getGraveyard(), target, game)) {
card = game.getCard(target.getFirstTarget());
if (card != null) {
zone = Zone.GRAVEYARD;
}
}
}
// Hand
@ -158,9 +155,6 @@ class MishraArtificerProdigyEffect extends OneShotEffect {
TargetCardInHand target = new TargetCardInHand(0, 1, filter);
if (controller.choose(Outcome.PutCardInPlay, controller.getHand(), target, game)) {
card = game.getCard(target.getFirstTarget());
if (card != null) {
zone = Zone.HAND;
}
}
}
// Library
@ -168,15 +162,12 @@ class MishraArtificerProdigyEffect extends OneShotEffect {
TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter);
if (controller.searchLibrary(target, game)) {
card = game.getCard(target.getFirstTarget());
if (card != null) {
zone = Zone.LIBRARY;
}
}
controller.shuffleLibrary(game);
}
// Put on battlefield
if (card != null) {
controller.moveCards(card, zone, Zone.BATTLEFIELD, source, game);
controller.moveCards(card, null, Zone.BATTLEFIELD, source, game);
}
return true;
}

2
Mage/src/mage/players/PlayerImpl.java
View file

@ -2983,7 +2983,7 @@ public abstract class PlayerImpl implements Player, Serializable {
case BATTLEFIELD:
for (Card card : cards) {
fromZone = game.getState().getZone(card.getId());
if (putOntoBattlefieldWithInfo(card, game, fromZone, source == null ? null : source.getSourceId(), false, !card.isFaceDown(game))) {
if (putOntoBattlefieldWithInfo(card, game, fromZone, source == null ? null : source.getSourceId(), false, card.isFaceDown(game))) {
successfulMovedCards.add(card);
}
}