From ac53b131e006618723e469e819ede6d14998d5f6 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:10:50 +0000 Subject: [PATCH] update Consume the Meek to exercise new AllZoneUtil functions --- src/forge/CardFactory.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index e271f5b3cc4..68caa56154d 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -18778,12 +18778,11 @@ public class CardFactory implements NewConstants { @Override public void resolve() { CardList all = new CardList(); - all.addAll(getHumanCreatures().toArray()); - all.addAll(getComputerCreatures().toArray()); + all.add(getHumanCreatures()); + all.add(getComputerCreatures()); for(int i = 0; i < all.size(); i++) { Card c = all.get(i); - System.out.println("Consume the Meek: " + c); AllZone.GameAction.destroyNoRegeneration(c); } }// resolve() @@ -18795,17 +18794,13 @@ public class CardFactory implements NewConstants { }; private CardList getHumanCreatures() { - CardList human = new CardList(); - human.addAll(AllZone.Human_Play.getCards()); - human = human.filter(filter); - return human; + CardList human = AllZoneUtil.getPlayerCardsInPlay(Constant.Player.Human); + return human.filter(filter); } private CardList getComputerCreatures() { - CardList comp = new CardList(); - comp.addAll(AllZone.Computer_Play.getCards()); - comp = comp.filter(filter); - return comp; + CardList comp = AllZoneUtil.getPlayerCardsInPlay(Constant.Player.Computer); + return comp.filter(filter); } @Override