Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ReturnCardAction to PutOntoBattlefieldAction 

fixes #1632
master
Ada Joule 2018-11-26 05:19:37 +07:00
parent 3e15d41c16
commit b4e2e742a1
43 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/Magarena/scripts/Abduction.groovy
View File

@ -15,7 +15,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicCard died = event.getRefCard();
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Graveyard,
died,
died.getOwner()

2
release/Magarena/scripts/Aether_Vial.groovy
View File

@ -33,7 +33,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetCard(game, {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersHand,it,event.getPlayer()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersHand,it,event.getPlayer()));
});
}
}

2
release/Magarena/scripts/Aetherplasm.groovy
View File

@ -11,7 +11,7 @@ def action = {
final MagicGame game, final MagicEvent event ->
if (event.isYes()) {
event.processTargetCard(game, {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.OwnersHand,
it,
event.getPlayer(),

2
release/Magarena/scripts/Call_of_the_Wild.groovy
View File

@ -25,7 +25,7 @@
for (final MagicCard card : cards) {
game.doAction(new RevealAction(card));
if (card.hasType(MagicType.Creature)) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, player));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, player));
} else {
game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, MagicLocationType.Graveyard));
game.logAppendMessage(player, "${player.getName()} puts ${card.getName()} into the graveyard.")

2
release/Magarena/scripts/Chaos_Warp.groovy
View File

@ -19,7 +19,7 @@
final MagicCard topCard = it.getOwner().getLibrary().getCardAtTop();
game.doAction(new RevealAction(topCard));
if (topCard.isPermanentCard()) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, topCard, it.getOwner()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, topCard, it.getOwner()));
}
});
}

2
release/Magarena/scripts/Coiling_Oracle.groovy
View File

@ -14,7 +14,7 @@
for (final MagicCard card : event.getPlayer().getLibrary().getCardsFromTop(1)) {
game.doAction(new RevealAction(card));
if (card.hasType(MagicType.Land)) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.OwnersLibrary,
card,
event.getPlayer()

2
release/Magarena/scripts/Conqueror_s_Galleon.groovy
View File

@ -11,7 +11,7 @@ def endOfCombatTrigger = new AtEndOfCombatTrigger() {
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicPermanent sourcePermanent = event.getPermanent();
game.doAction(new RemoveFromPlayAction(sourcePermanent, MagicLocationType.Exile));
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Exile,
sourcePermanent.getCard(),
event.getPlayer(),

2
release/Magarena/scripts/Deathrender.groovy
View File

@ -20,7 +20,7 @@
if (event.isYes()) {
event.processTargetCard(game, {
final MagicPermanent sn = event.getPermanent();
game.doAction(new ReturnCardAction(MagicLocationType.OwnersHand,it,event.getPlayer(), {
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersHand,it,event.getPlayer(), {
final MagicPermanent perm ->
final MagicGame G = perm.getGame();
G.doAction(new AttachAction(sn.map(G), perm));

2
release/Magarena/scripts/Defy_Death.groovy
View File

@ -15,7 +15,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetCard(game, {
game.doAction(new ReturnCardAction(MagicLocationType.Graveyard,it,event.getPlayer(), {
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Graveyard,it,event.getPlayer(), {
final MagicPermanent perm ->
final MagicGame G = perm.getGame();
if (perm.hasSubType(MagicSubType.Angel)) {

2
release/Magarena/scripts/Druidic_Satchel.groovy
View File

@ -32,7 +32,7 @@
game.doAction(new PlayTokensAction(event.getPlayer(), CardDefinitions.getToken("1/1 green Saproling creature token"), 1));
}
if (card.hasType(MagicType.Land)) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, event.getPlayer()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, event.getPlayer()));
}
if (!card.hasType(MagicType.Creature) && !card.hasType(MagicType.Land)) {
game.doAction(new ChangeLifeAction(event.getPlayer(), 2));

4
release/Magarena/scripts/Dubious_Challenge.groovy
View File

@ -5,10 +5,10 @@ def putOntoBattlefieldAction = {
final MagicCardList rest = new MagicCardList(event.getRefCardList());
event.processChosenCards(game, {
rest.remove(it);
game.doAction(new ReturnCardAction(MagicLocationType.Exile, it, opponent));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Exile, it, opponent));
});
rest.each {
game.doAction(new ReturnCardAction(MagicLocationType.Exile, it, controller));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Exile, it, controller));
}
}

2
release/Magarena/scripts/Elvish_Rejuvenator.groovy
View File

@ -2,7 +2,7 @@ def action = {
final MagicGame game, final MagicEvent event ->
final MagicCardList topCards = new MagicCardList(event.getRefCardList());
event.processChosenCards(game, {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.OwnersLibrary,
it,
event.getPlayer(),

2
release/Magarena/scripts/Explorer_s_Scope.groovy
View File

@ -3,7 +3,7 @@ def action = {
if (event.isYes()) {
final MagicCard card = event.getRefCard();
final MagicPlayer player = event.getPlayer();
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, event.getPlayer(), MagicPlayMod.TAPPED));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, event.getPlayer(), MagicPlayMod.TAPPED));
game.logAppendMessage(player, "${player} puts (${card}) it onto the battlefield tapped.")
}
}

2
release/Magarena/scripts/Fearsome_Awakening.groovy
View File

@ -15,7 +15,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetCard(game, {
game.doAction(new ReturnCardAction(MagicLocationType.Graveyard,it,event.getPlayer(), {
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Graveyard,it,event.getPlayer(), {
final MagicPermanent perm ->
final MagicGame G = perm.getGame();
if (perm.hasSubType(MagicSubType.Dragon)) {

2
release/Magarena/scripts/Genesis_Wave.groovy
View File

@ -2,7 +2,7 @@ def toBattlefield = {
final MagicGame game, final MagicEvent event ->
event.processChosenCards(game, {
final MagicCard card ->
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.OwnersLibrary,
card,
event.getPlayer()

2
release/Magarena/scripts/Helm_of_Obedience.groovy
View File

@ -44,7 +44,7 @@
if (it.getGraveyard().contains(card)) {
creatureCards++;
game.doAction(new SacrificeAction(event.getPermanent()));
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Graveyard,
card,
event.getPlayer()

2
release/Magarena/scripts/Impromptu_Raid.groovy
View File

@ -29,7 +29,7 @@
game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, MagicLocationType.Graveyard));
game.logAppendMessage(player, "${player.getName()} puts ${card.getName()} into the graveyard.");
} else {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.OwnersLibrary,
card,
player,

2
release/Magarena/scripts/Into_the_Wilds.groovy
View File

@ -3,7 +3,7 @@ def action = {
if (event.isYes()) {
final MagicCard card = event.getRefCard();
final MagicPlayer player = event.getPlayer();
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, event.getPlayer()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, event.getPlayer()));
game.logAppendMessage(player, "${player} puts (${card}) it onto the battlefield.")
}
}

2
release/Magarena/scripts/Isareth_the_Awakener.groovy
View File

@ -6,7 +6,7 @@ def action = {
final MagicEvent manaCost = new MagicPayManaCostEvent(event.getSource(), "{${cost}}");
if (manaCost.isSatisfied()) {
game.addEvent(manaCost);
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Graveyard,
card,
event.getPlayer(),

4
release/Magarena/scripts/Journey_to_Eternity.groovy
View File

@ -16,12 +16,12 @@
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Graveyard,
event.getRefPermanent().getCard(),
event.getPlayer()
));
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Graveyard,
event.getPermanent().getCard(),
event.getPlayer(),

2
release/Magarena/scripts/Long_Road_Home.groovy
View File

@ -17,7 +17,7 @@ def DelayedTrigger = {
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Exile,
event.getCard(),
event.getPlayer(),

2
release/Magarena/scripts/Lurking_Predators.groovy
View File

@ -27,7 +27,7 @@ def action = {
for (final MagicCard card : cards) {
game.doAction(new RevealAction(card));
if (card.hasType(MagicType.Creature) == true) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, event.getPlayer()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, event.getPlayer()));
} else {
game.addEvent(new MagicEvent(
event.getSource(),

2
release/Magarena/scripts/Madcap_Experiment.groovy
View File

@ -23,7 +23,7 @@
game.doAction(new RevealAction(topCard));
amount++;
if (predicate(topCard)) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, topCard, player));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, topCard, player));
break;
} else {
revealed.add(topCard);

2
release/Magarena/scripts/Miraculous_Recovery.groovy
View File

@ -14,7 +14,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetCard(game, {
game.doAction(new ReturnCardAction(MagicLocationType.Graveyard,it,event.getPlayer(),{
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Graveyard,it,event.getPlayer(),{
final MagicPermanent perm ->
final MagicGame G = perm.getGame();
G.doAction(new ChangeCountersAction(event.getPlayer().map(G), perm, MagicCounterType.PlusOne, 1));

2
release/Magarena/scripts/Nahiri__the_Lithomancer.groovy
View File

@ -63,7 +63,7 @@ def AN_EQUIPMENT_YOU_CONTROL = new MagicTargetChoice("an Equipment you control")
if (event.isYes()) {
event.processTargetCard(game, {
final MagicLocationType from = it.isInHand() ? MagicLocationType.OwnersHand : MagicLocationType.Graveyard;
game.doAction(new ReturnCardAction(from,it,event.getPlayer()));
game.doAction(new PutOntoBattlefieldAction(from,it,event.getPlayer()));
});
}
}

2
release/Magarena/scripts/Nazahn__Revered_Bladesmith.groovy
View File

@ -18,7 +18,7 @@ def choice = new MagicTargetChoice("an Equipment card from your library");
event.processTargetCard(game, {
game.doAction(new RevealAction(it));
if (it.getName().equals("Hammer of Nazahn")) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary,it,event.getPlayer()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary,it,event.getPlayer()));
} else {
game.doAction(new ShiftCardAction(it, MagicLocationType.OwnersLibrary, MagicLocationType.OwnersHand));
}

2
release/Magarena/scripts/Nezahal__Primal_Tide.groovy
View File

@ -18,7 +18,7 @@ def trigger = {
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Exile,
event.getCard(),
event.getPlayer(),

2
release/Magarena/scripts/Nissa__Nature_s_Artisan.groovy
View File

@ -17,7 +17,7 @@
game.doAction(new RevealAction(cards));
for (final MagicCard card : cards) {
if (card.hasType(MagicType.Land)) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, player));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, player));
} else {
game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, MagicLocationType.OwnersHand));
}

2
release/Magarena/scripts/Obzedat__Ghost_Council.groovy
View File

@ -21,7 +21,7 @@ def DelayedTrigger = {
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Exile,
event.getCard(),
event.getPlayer(),

2
release/Magarena/scripts/Pattern_of_Rebirth.groovy
View File

@ -18,7 +18,7 @@
public void executeEvent(final MagicGame game, final MagicEvent event) {
if (event.isYes()) {
event.processTargetCard(game,{
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, it, event.getPlayer()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, it, event.getPlayer()));
game.doAction(new ShuffleLibraryAction(event.getPlayer()));
});
}

2
release/Magarena/scripts/Siren_s_Ruse.groovy
View File

@ -14,7 +14,7 @@
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetPermanent(game, {
game.doAction(new RemoveFromPlayAction(it, MagicLocationType.Exile));
game.doAction(new ReturnCardAction(MagicLocationType.Exile, it.getCard(), it.getOwner()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.Exile, it.getCard(), it.getOwner()));
if (it.hasSubType(MagicSubType.Pirate)) {
game.doAction(new DrawAction(event.getPlayer()));
}

2
release/Magarena/scripts/Skyward_Eye_Prophets.groovy
View File

@ -25,7 +25,7 @@
for (final MagicCard card : cards) {
game.doAction(new RevealAction(card));
if (card.hasType(MagicType.Land)) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary, card, player));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary, card, player));
} else {
game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, MagicLocationType.OwnersHand));
}

2
release/Magarena/scripts/Telemin_Performance.groovy
View File

@ -23,7 +23,7 @@
game.doAction(new MillLibraryAction(it,1));
} else {
creatureCards++;
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.OwnersLibrary,
library.getCardAtTop(),
event.getPlayer()

2
release/Magarena/scripts/Thrasios__Triton_Hero.groovy
View File

@ -4,7 +4,7 @@ def action = {
for (final MagicCard card : player.getLibrary().getCardsFromTop(1)) {
game.doAction(new RevealAction(card));
if (card.hasType(MagicType.Land)) {
game.doAction(new ReturnCardAction(MagicLocationType.OwnersLibrary,card,event.getPlayer(),MagicPlayMod.TAPPED));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersLibrary,card,event.getPlayer(),MagicPlayMod.TAPPED));
} else {
game.doAction(new DrawAction(event.getPlayer()));
}

2
release/Magarena/scripts/Traveling_Plague.groovy
View File

@ -16,7 +16,7 @@
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicCard card = event.getPermanent().getCard();
if (card.isInGraveyard()) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Graveyard,
event.getPermanent().getCard(),
event.getPlayer()

2
release/Magarena/scripts/World_Shaper.groovy
View File

@ -11,7 +11,7 @@
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
card(MagicType.Land).from(MagicTargetType.Graveyard).filter(event.getPlayer()) each {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Graveyard,
it,
event.getPlayer(),

2
release/Magarena/scripts/Zoologist.groovy
View File

@ -25,7 +25,7 @@
for (final MagicCard card : event.getPlayer().getLibrary().getCardsFromTop(1)) {
game.doAction(new RevealAction(card));
if (card.hasType(MagicType.Creature)) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.OwnersLibrary,
card,
event.getPlayer()

6
src/magic/model/action/ReturnCardAction.java → src/magic/model/action/PutOntoBattlefieldAction.java
View File

@ -7,21 +7,21 @@ import magic.model.MagicGame;
import magic.model.MagicLocationType;
import magic.model.MagicPlayer;
public class ReturnCardAction extends MagicAction {
public class PutOntoBattlefieldAction extends MagicAction {
private final MagicPlayer controller;
private final MagicCard card;
private final MagicLocationType from;
private final List<? extends MagicPermanentAction> modifications;
public ReturnCardAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final List<? extends MagicPermanentAction> aModifications) {
public PutOntoBattlefieldAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final List<? extends MagicPermanentAction> aModifications) {
card = aCard;
controller = aController;
from = aFrom;
modifications = aModifications;
}
public ReturnCardAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final MagicPermanentAction... aModifications) {
public PutOntoBattlefieldAction(final MagicLocationType aFrom, final MagicCard aCard, final MagicPlayer aController, final MagicPermanentAction... aModifications) {
this(aFrom, aCard, aController, Arrays.asList(aModifications));
}

2
src/magic/model/action/ReturnLinkedExileAction.java
View File

@ -45,7 +45,7 @@ public class ReturnLinkedExileAction extends MagicAction {
for (final MagicCard card : cardList) {
if (card.isInExile()) {
if (location == MagicLocationType.Battlefield) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Exile,
card,
controller.isValid() ? controller : card.getOwner(),

4
src/magic/model/event/MagicNinjutsuActivation.java
View File

@ -6,7 +6,7 @@ import magic.model.MagicLocationType;
import magic.model.MagicManaCost;
import magic.model.MagicPayedCost;
import magic.model.action.MagicPlayMod;
import magic.model.action.ReturnCardAction;
import magic.model.action.PutOntoBattlefieldAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.condition.MagicCondition;
@ -52,7 +52,7 @@ public class MagicNinjutsuActivation extends MagicCardAbilityActivation {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.OwnersHand,
event.getCard(),
event.getPlayer(),

4
src/magic/model/event/MagicPutOntoBattlefieldEvent.java
View File

@ -10,7 +10,7 @@ import magic.model.MagicPlayer;
import magic.model.MagicSource;
import magic.model.MagicTuple;
import magic.model.action.MagicPermanentAction;
import magic.model.action.ReturnCardAction;
import magic.model.action.PutOntoBattlefieldAction;
import magic.model.choice.MagicChoice;
import magic.model.target.MagicGraveyardTargetPicker;
@ -45,7 +45,7 @@ public class MagicPutOntoBattlefieldEvent extends MagicEvent {
event.getPlayer(),
MagicMessage.format("Chosen (%s).", card)
);
game.doAction(new ReturnCardAction(MagicLocationType.OwnersHand,card,event.getPlayer(),tup.getMods()));
game.doAction(new PutOntoBattlefieldAction(MagicLocationType.OwnersHand,card,event.getPlayer(),tup.getMods()));
});
}
};

4
src/magic/model/event/MagicRuleEventAction.java
View File

@ -376,7 +376,7 @@ public enum MagicRuleEventAction {
it,
MagicLocationType.Exile
));
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Exile,
it.getCard(),
event.getPlayer()
@ -402,7 +402,7 @@ public enum MagicRuleEventAction {
it,
MagicLocationType.Exile
));
game.doAction(new ReturnCardAction(
game.doAction(new PutOntoBattlefieldAction(
MagicLocationType.Exile,
it.getCard(),
it.getOwner(),

6
src/magic/model/event/MagicSearchOntoBattlefieldEvent.java
View File

@ -10,7 +10,7 @@ import magic.model.MagicSource;
import magic.model.MagicTuple;
import magic.model.action.AIRevealAction;
import magic.model.action.MagicPermanentAction;
import magic.model.action.ReturnCardAction;
import magic.model.action.PutOntoBattlefieldAction;
import magic.model.action.ShuffleLibraryAction;
import magic.model.choice.MagicCardChoiceResult;
import magic.model.choice.MagicChoice;
@ -53,7 +53,7 @@ public class MagicSearchOntoBattlefieldEvent extends MagicEvent {
MagicMessage.format("Found (%s).", card)
);
game.doAction(new AIRevealAction(card));
game.doAction(new ReturnCardAction(card.getLocation(),card,event.getPlayer(),tup.getMods()));
game.doAction(new PutOntoBattlefieldAction(card.getLocation(),card,event.getPlayer(),tup.getMods()));
});
game.doAction(new ShuffleLibraryAction(event.getPlayer()));
} else {
@ -63,7 +63,7 @@ public class MagicSearchOntoBattlefieldEvent extends MagicEvent {
MagicMessage.format("Found (%s).", card)
);
game.doAction(new AIRevealAction(card));
game.doAction(new ReturnCardAction(card.getLocation(),card,event.getPlayer(),tup.getMods()));
game.doAction(new PutOntoBattlefieldAction(card.getLocation(),card,event.getPlayer(),tup.getMods()));
});
game.doAction(new ShuffleLibraryAction(event.getPlayer()));
}