external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- removed a call to isHuman

Browse Source
This commit is contained in:
moomarc
2013-05-24 12:13:21 +00:00
parent 76a2a73aa1
commit 24ef3f77a8
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
View File

@@ -61,9 +61,9 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
cards.addAll(p.getCardsIn(origin)); cards.addAll(p.getCardsIn(origin));
} }
} }
if (sa.getActivatingPlayer().isHuman() && origin.contains(ZoneType.Library) if (sa.getActivatingPlayer().isHuman() && origin.contains(ZoneType.Library)
&& sa.hasParam("Search")) { && sa.hasParam("Search")) {
GuiChoose.oneOrNone("Looking at the Library", GuiChoose.oneOrNone("Looking at the Library",
CardLists.getValidCards(cards, "Card.inZoneLibrary", sa.getActivatingPlayer(), sa.getSourceCard())); CardLists.getValidCards(cards, "Card.inZoneLibrary", sa.getActivatingPlayer(), sa.getSourceCard()));
} }
cards = AbilityUtils.filterListByType(cards, sa.getParam("ChangeType"), sa); 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; final int libraryPos = sa.hasParam("LibraryPosition") ? Integer.parseInt(sa.getParam("LibraryPosition")) : 0;
if (sa.getActivatingPlayer().isHuman() && destination.equals(ZoneType.Library) && !sa.hasParam("Shuffle") if (destination.equals(ZoneType.Library) && !sa.hasParam("Shuffle") && cards.size() >= 2 && !random) {
&& cards.size() >= 2 && !random) { cards = sa.getActivatingPlayer().getController().orderMoveToZoneList(cards, destination);
cards = GuiChoose.order("Choose order of cards to put into the library", "Put first", 0, cards, null, null);
} }
if (destination.equals(ZoneType.Library) && random) { if (destination.equals(ZoneType.Library) && random) {

1
src/main/java/forge/card/ability/effects/DigUntilEffect.java
View File

@@ -134,7 +134,6 @@ public class DigUntilEffect extends SpellAbilityEffect {
// Allow ordering of found cards // Allow ordering of found cards
if ((foundDest.isKnown()) && found.size() >= 2) { if ((foundDest.isKnown()) && found.size() >= 2) {
found = p.getController().orderMoveToZoneList(found, foundDest); found = p.getController().orderMoveToZoneList(found, foundDest);
// should possibly use host.getController().getController()... for these instead of p.getController?
} }
final Iterator<Card> itr = found.iterator(); final Iterator<Card> itr = found.iterator();