mirror of
https://github.com/correl/mage.git
synced 2024-12-25 11:11:16 +00:00
* Entomb - Fixed that the search was restricted to creatures instead for any card.
This commit is contained in:
parent
915651335a
commit
1cb3290cf3
1 changed files with 14 additions and 17 deletions
|
@ -29,18 +29,17 @@ package mage.sets.odyssey;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import mage.constants.CardType;
|
|
||||||
import mage.constants.Rarity;
|
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
import mage.abilities.effects.SearchEffect;
|
import mage.abilities.effects.SearchEffect;
|
||||||
import mage.cards.Card;
|
import mage.cards.Card;
|
||||||
import mage.cards.CardImpl;
|
import mage.cards.CardImpl;
|
||||||
import mage.cards.Cards;
|
import mage.cards.Cards;
|
||||||
import mage.cards.CardsImpl;
|
import mage.cards.CardsImpl;
|
||||||
|
import mage.constants.CardType;
|
||||||
import mage.constants.Outcome;
|
import mage.constants.Outcome;
|
||||||
|
import mage.constants.Rarity;
|
||||||
import mage.constants.Zone;
|
import mage.constants.Zone;
|
||||||
import mage.filter.common.FilterCreatureCard;
|
import mage.filter.FilterCard;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.players.Player;
|
import mage.players.Player;
|
||||||
import mage.target.common.TargetCardInLibrary;
|
import mage.target.common.TargetCardInLibrary;
|
||||||
|
@ -75,7 +74,7 @@ public class Entomb extends CardImpl<Entomb> {
|
||||||
class SearchLibraryPutInGraveyard extends SearchEffect<SearchLibraryPutInGraveyard> {
|
class SearchLibraryPutInGraveyard extends SearchEffect<SearchLibraryPutInGraveyard> {
|
||||||
|
|
||||||
public SearchLibraryPutInGraveyard() {
|
public SearchLibraryPutInGraveyard() {
|
||||||
super(new TargetCardInLibrary(new FilterCreatureCard()), Outcome.Neutral);
|
super(new TargetCardInLibrary(new FilterCard()), Outcome.Neutral);
|
||||||
staticText = "Search your library for a card and put that card into your graveyard. Then shuffle your library";
|
staticText = "Search your library for a card and put that card into your graveyard. Then shuffle your library";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,26 +89,24 @@ class SearchLibraryPutInGraveyard extends SearchEffect<SearchLibraryPutInGraveya
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean apply(Game game, Ability source) {
|
public boolean apply(Game game, Ability source) {
|
||||||
Player player = game.getPlayer(source.getControllerId());
|
Player controller = game.getPlayer(source.getControllerId());
|
||||||
if (player == null) {
|
if (controller == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (player.searchLibrary(target, game)) {
|
boolean result = false;
|
||||||
|
if (controller.searchLibrary(target, game)) {
|
||||||
if (target.getTargets().size() > 0) {
|
if (target.getTargets().size() > 0) {
|
||||||
Cards cards = new CardsImpl();
|
|
||||||
for (UUID cardId: (List<UUID>)target.getTargets()) {
|
for (UUID cardId: (List<UUID>)target.getTargets()) {
|
||||||
Card card = player.getLibrary().remove(cardId, game);
|
Card card = controller.getLibrary().remove(cardId, game);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
card.moveToZone(Zone.GRAVEYARD, source.getId(), game, false);
|
controller.moveCardToGraveyardWithInfo(card, source.getSourceId(), game, Zone.LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
player.shuffleLibrary(game);
|
result = true;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
player.shuffleLibrary(game);
|
controller.shuffleLibrary(game);
|
||||||
return false;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue