From 8187b250d2bab0cf96d25c35fa1575a193c865f0 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Sat, 6 Nov 2010 02:42:48 +0000 Subject: [PATCH] fixed search library --- Mage/src/mage/abilities/effects/SearchEffect.java | 5 +++-- Mage/src/mage/players/Player.java | 3 ++- Mage/src/mage/players/PlayerImpl.java | 4 ++-- Mage/src/mage/target/common/TargetCardInLibrary.java | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Mage/src/mage/abilities/effects/SearchEffect.java b/Mage/src/mage/abilities/effects/SearchEffect.java index 7b8c9d30d79..68c1e53c2ae 100644 --- a/Mage/src/mage/abilities/effects/SearchEffect.java +++ b/Mage/src/mage/abilities/effects/SearchEffect.java @@ -30,6 +30,7 @@ package mage.abilities.effects; import mage.Constants.Outcome; import mage.target.TargetCard; +import mage.target.common.TargetCardInLibrary; /** * @@ -37,9 +38,9 @@ import mage.target.TargetCard; */ public abstract class SearchEffect> extends OneShotEffect { - protected TargetCard target; + protected TargetCardInLibrary target; - public SearchEffect(TargetCard target, Outcome outcome) { + public SearchEffect(TargetCardInLibrary target, Outcome outcome) { super(outcome); this.target = target; } diff --git a/Mage/src/mage/players/Player.java b/Mage/src/mage/players/Player.java index 488ffbb3526..7dd6508d970 100644 --- a/Mage/src/mage/players/Player.java +++ b/Mage/src/mage/players/Player.java @@ -55,6 +55,7 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.TargetAmount; import mage.target.TargetCard; +import mage.target.common.TargetCardInLibrary; import mage.util.Copyable; /** @@ -96,7 +97,7 @@ public interface Player extends MageItem, Copyable { public boolean removeFromBattlefield(Permanent permanent, Game game); public boolean putInGraveyard(Card card, Game game, boolean fromBattlefield); public boolean removeFromGraveyard(Card card, Game game); - public boolean searchLibrary(TargetCard target, Game game); + public boolean searchLibrary(TargetCardInLibrary target, Game game); public boolean canPlayLand(); public boolean playLand(Card card, Game game); public boolean activateAbility(ActivatedAbility ability, Game game); diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index ee006d2a210..ec32fb3ae46 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -812,10 +812,10 @@ public abstract class PlayerImpl> implements Player, Ser } @Override - public boolean searchLibrary(TargetCard target, Game game) { + public boolean searchLibrary(TargetCardInLibrary target, Game game) { //20091005 - 701.14c if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.SEARCH_LIBRARY, playerId, playerId))) { - TargetCard newTarget; + TargetCardInLibrary newTarget; if (library.count(target.getFilter(), game) < target.getNumberOfTargets()) newTarget = new TargetCardInLibrary(library.count(target.getFilter(), game), target.getMaxNumberOfTargets(), target.getFilter()); else diff --git a/Mage/src/mage/target/common/TargetCardInLibrary.java b/Mage/src/mage/target/common/TargetCardInLibrary.java index 3a8a4106754..017cbfb2fd0 100644 --- a/Mage/src/mage/target/common/TargetCardInLibrary.java +++ b/Mage/src/mage/target/common/TargetCardInLibrary.java @@ -66,7 +66,7 @@ public class TargetCardInLibrary extends TargetCard { } @Override - public boolean chooseTarget(Outcome outcome, UUID playerId, Ability source, Game game) { + public boolean choose(Outcome outcome, UUID playerId, Game game) { Player player = game.getPlayer(playerId); while (!isChosen() && !doneChosing()) { chosen = targets.size() >= minNumberOfTargets;