From 974cb4435bb826769b935aaffc8335eeaa83d53f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 20 Oct 2014 21:26:46 +0200 Subject: [PATCH] * More fixes to the [BOK] cards and mana pool handling. --- .../mage/sets/betrayersofkamigawa/IwamoriOfTheOpenFist.java | 2 +- .../src/mage/sets/betrayersofkamigawa/MarkOfSakiko.java | 3 ++- .../mage/sets/betrayersofkamigawa/SakikoMotherOfSummer.java | 1 + .../src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java | 6 ------ .../effects/common/RevealLibraryPutIntoHandEffect.java | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IwamoriOfTheOpenFist.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IwamoriOfTheOpenFist.java index bfc3b210522..ff754f8e6fa 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IwamoriOfTheOpenFist.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IwamoriOfTheOpenFist.java @@ -113,7 +113,7 @@ class IwamoriOfTheOpenFistEffect extends OneShotEffect { for (UUID playerId : game.getOpponents(controller.getId())) { Player opponent = game.getPlayer(playerId); Target target = new TargetCardInHand(filter); - if (opponent != null && target.canChoose(opponent.getId(), source.getSourceId(), game)) { + if (opponent != null && target.canChoose(source.getSourceId(), opponent.getId(), game)) { if (opponent.chooseUse(Outcome.PutCreatureInPlay, "Put a legendary creature card from your hand onto the battlefield?", game)) { if (target.chooseTarget(Outcome.PutCreatureInPlay, opponent.getId(), source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfSakiko.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfSakiko.java index ab52ea103cb..e663d48beaa 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfSakiko.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MarkOfSakiko.java @@ -46,9 +46,9 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; -import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import mage.target.targetpointer.FixedTarget; /** * @@ -109,6 +109,7 @@ class MarkOfSakikoTriggeredAbility extends TriggeredAbilityImpl { if (event.getSourceId().equals(getSourceId())) { this.getEffects().clear(); Effect effect = new AddManaToManaPoolEffect(new Mana(0,event.getAmount(),0,0,0,0,0), "that player", true); + effect.setTargetPointer(new FixedTarget(getControllerId())); effect.setText("add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end"); this.addEffect(effect); return true; diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SakikoMotherOfSummer.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SakikoMotherOfSummer.java index d9a1145fa4a..bf9948764d0 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SakikoMotherOfSummer.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SakikoMotherOfSummer.java @@ -100,6 +100,7 @@ class SakikoMotherOfSummerTriggeredAbility extends TriggeredAbilityImpl { if (creature != null && creature.getControllerId().equals(controllerId)) { this.getEffects().clear(); Effect effect = new AddManaToManaPoolEffect(new Mana(0,event.getAmount(),0,0,0,0,0), "that player", true); + effect.setTargetPointer(new FixedTarget(creature.getControllerId())); effect.setText("add that much {G} to your mana pool. Until end of turn, this mana doesn't empty from your mana pool as steps and phases end"); this.addEffect(effect); return true; diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java b/Mage.Sets/src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java index b8ea5e52096..8484d182336 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/KruphixGodOfHorizons.java @@ -27,11 +27,8 @@ */ package mage.sets.journeyintonyx; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; import mage.MageInt; -import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.DevotionCount; @@ -44,14 +41,11 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; import mage.constants.Duration; -import mage.constants.ManaType; import mage.constants.Outcome; import mage.constants.Rarity; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.players.ManaPool; -import mage.players.Player; /** * diff --git a/Mage/src/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java b/Mage/src/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java index d2581ebab64..78cf2a7424e 100644 --- a/Mage/src/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java +++ b/Mage/src/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java @@ -93,7 +93,7 @@ public class RevealLibraryPutIntoHandEffect extends OneShotEffect { Set cardsList = cards.getCards(game); for (Card card : cardsList) { if (filter.match(card, game)) { - card.moveToZone(Zone.HAND, source.getSourceId(), game, true); + player.moveCardToHandWithInfo(card, source.getSourceId(), game, Zone.LIBRARY); cards.remove(card); } }