From 24ef3f77a8c4b0e44af510e0d9bf73fc88b493db Mon Sep 17 00:00:00 2001 From: moomarc Date: Fri, 24 May 2013 12:13:21 +0000 Subject: [PATCH] - removed a call to isHuman --- .../forge/card/ability/effects/ChangeZoneAllEffect.java | 9 ++++----- .../java/forge/card/ability/effects/DigUntilEffect.java | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java index 6c635f172c8..5a7beb63563 100644 --- a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java +++ b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java @@ -61,9 +61,9 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect { cards.addAll(p.getCardsIn(origin)); } } - if (sa.getActivatingPlayer().isHuman() && origin.contains(ZoneType.Library) + if (sa.getActivatingPlayer().isHuman() && origin.contains(ZoneType.Library) && sa.hasParam("Search")) { - GuiChoose.oneOrNone("Looking at the Library", + GuiChoose.oneOrNone("Looking at the Library", CardLists.getValidCards(cards, "Card.inZoneLibrary", sa.getActivatingPlayer(), sa.getSourceCard())); } cards = AbilityUtils.filterListByType(cards, sa.getParam("ChangeType"), sa); @@ -79,9 +79,8 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect { final int libraryPos = sa.hasParam("LibraryPosition") ? Integer.parseInt(sa.getParam("LibraryPosition")) : 0; - if (sa.getActivatingPlayer().isHuman() && destination.equals(ZoneType.Library) && !sa.hasParam("Shuffle") - && cards.size() >= 2 && !random) { - cards = GuiChoose.order("Choose order of cards to put into the library", "Put first", 0, cards, null, null); + if (destination.equals(ZoneType.Library) && !sa.hasParam("Shuffle") && cards.size() >= 2 && !random) { + cards = sa.getActivatingPlayer().getController().orderMoveToZoneList(cards, destination); } if (destination.equals(ZoneType.Library) && random) { diff --git a/src/main/java/forge/card/ability/effects/DigUntilEffect.java b/src/main/java/forge/card/ability/effects/DigUntilEffect.java index dcc900fd535..5da6b6253eb 100644 --- a/src/main/java/forge/card/ability/effects/DigUntilEffect.java +++ b/src/main/java/forge/card/ability/effects/DigUntilEffect.java @@ -134,7 +134,6 @@ public class DigUntilEffect extends SpellAbilityEffect { // Allow ordering of found cards if ((foundDest.isKnown()) && found.size() >= 2) { found = p.getController().orderMoveToZoneList(found, foundDest); - // should possibly use host.getController().getController()... for these instead of p.getController? } final Iterator itr = found.iterator();