From c12b17affbf4618f0a1207bf703d76bd2e32abd8 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 09:29:33 +0000
Subject: [PATCH] more code cleanup for Zones.

---
 src/forge/CardFactoryUtil.java       | 41 ++++++++--------------------
 src/forge/CardFactory_Creatures.java |  2 +-
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index 5b23bd6fe4e..dcc0b06b828 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -4288,21 +4288,25 @@ public class CardFactoryUtil {
         }
         return s;
     }
-
+    
+    @Deprecated
     public static CardList getCards(String cardName)
     {
-    	CardList list = new CardList();
+    	return AllZoneUtil.getCardsInPlay(cardName);
+    	/*CardList list = new CardList();
     	list.addAll(AllZone.Human_Play.getCards());
     	list.addAll(AllZone.Computer_Play.getCards());
     	list = list.getName(cardName);
-    	return list;
+    	return list;*/
     }
     
+    @Deprecated
     public static CardList getCards(String cardName, Player player) {
-    	PlayerZone play = AllZone.getZone(Constant.Zone.Play, player);
+    	return AllZoneUtil.getPlayerCardsInPlay(player, cardName);
+    	/*PlayerZone play = AllZone.getZone(Constant.Zone.Play, player);
         CardList list = new CardList(play.getCards());
         list = list.getName(cardName);
-        return list;
+        return list;*/
     }
     
     public static int countBasicLandTypes(Player player) {
@@ -4388,8 +4392,9 @@ public class CardFactoryUtil {
     		return null;
     }
     
+    @Deprecated
     public static CardList makeToken(String name, String imageName, Card source, String manaCost, String[] types, int baseAttack, int baseDefense, String[] intrinsicKeywords) {
-    	// todo(sol) this function shouldn't be called, better to call makeToken with String controller as third paramter
+    	// todo(sol) this function shouldn't be called, better to call makeToken with Player controller as third paramter
     	CardList list = new CardList();
         Card c = new Card();
         c.setName(name);
@@ -4598,7 +4603,7 @@ public class CardFactoryUtil {
      */
     public static Card getWorstLand(Player player) {
     	Card worstLand = null;
-    	CardList lands = CardFactoryUtil.getLandsInPlay(player);
+    	CardList lands = AllZoneUtil.getPlayerLandsInPlay(player);
     	//first, check for tapped, basic lands
     	for( int i = 0; i < lands.size(); i++ ) {
     		Card tmp = lands.get(i);
@@ -4636,28 +4641,6 @@ public class CardFactoryUtil {
     	return worstLand;
     }//end getWorstLand
 
-    /**
-     * getLandsInPlay(Player)
-     *
-     * This function returns a CardList of all lands that the given
-     * player has in Constant.Zone.Play
-     *
-     * @param player - AllZone.HumanPlayer or AllZone.ComputerPlayer
-     * @return a CardList of that players lands
-     */
-    public static CardList getLandsInPlay(Player player) {
-    	PlayerZone compBattlezone = AllZone.getZone(Constant.Zone.Play, player);
-    	CardList list = new CardList(compBattlezone.getCards());
-    	list = list.filter(new CardListFilter() {
-    		public boolean addCard(Card c) {
-    			if(c.isLand()) return true;
-    			else return false;
-    		}
-    	});
-    	return list;
-    }
-
-    
     //may return null
     static public Card getRandomCard(CardList list) {
         if(list.size() == 0) return null;
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 24e0404dd73..c3b751b9117 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -5806,7 +5806,7 @@ public class CardFactory_Creatures {
                 
                 CardList getCreature() {
 
-                	final int total = CardFactoryUtil.getLandsInPlay(AllZone.ComputerPlayer).size();
+                	final int total = AllZoneUtil.getPlayerLandsInPlay(AllZone.ComputerPlayer).size();
                     //toughness of 1
                     CardList list = CardFactoryUtil.AI_getHumanCreature(total, card, true);
                     list = list.filter(new CardListFilter() {