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

added replace event to putOntoBattlefield call - moved logic for moving cards to putOntoBattlefield

Browse source
This commit is contained in:
BetaSteward 2012-03-05 09:15:47 -05:00
parent 11a64a1c6a
commit 82f8a7cdee
35 changed files with 50 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java
View file

@ -124,7 +124,6 @@ class ArachnusSpinnerEffect extends OneShotEffect<ArachnusSpinnerEffect> {
if (player.choose(Outcome.PutCardInPlay, player.getGraveyard(), target, game)) {
card = game.getCard(target.getFirstTarget());
if (card != null) {
player.removeFromGraveyard(card, game);
zone = Zone.GRAVEYARD;
}
}
@ -134,7 +133,6 @@ class ArachnusSpinnerEffect extends OneShotEffect<ArachnusSpinnerEffect> {
if (player.searchLibrary(target, game)) {
card = game.getCard(target.getFirstTarget());
if (card != null) {
player.removeFromLibrary(card, game);
player.shuffleLibrary(game);
zone = Zone.LIBRARY;
}

2
Mage.Sets/src/mage/sets/magic2012/DoublingChant.java
View file

@ -108,7 +108,7 @@ class DoublingChantEffect extends OneShotEffect<DoublingChantEffect> {
TargetCardInLibrary target = new TargetCardInLibrary(filter);
if (player.searchLibrary(target, game)) {
Card card = player.getLibrary().remove(target.getFirstTarget(), game);
Card card = player.getLibrary().getCard(target.getFirstTarget(), game);
if (card != null) {
chosenCards.add(card);
}

2
Mage.Sets/src/mage/sets/magic2012/DruidicSatchel.java
View file

@ -92,7 +92,7 @@ class DruidicSatchelEffect extends OneShotEffect<DruidicSatchelEffect> {
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
}
if (card.getCardType().contains(CardType.LAND)) {
player.getLibrary().remove(card.getId(), game);
player.getLibrary().getCard(card.getId(), game);
card.putOntoBattlefield(game, Zone.LIBRARY, source.getId(), source.getControllerId());
}
if (!card.getCardType().contains(CardType.CREATURE) && !card.getCardType().contains(CardType.LAND)) {

1
Mage.Sets/src/mage/sets/magic2012/QuicksilverAmulet.java
View file

@ -101,7 +101,6 @@ class PutCreatureOnBattlefieldEffect extends OneShotEffect<PutCreatureOnBattlefi
if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {
player.removeFromHand(card, game);
card.putOntoBattlefield(game, Zone.HAND, source.getId(), source.getControllerId());
return true;
}