From c6d416a4d07dffe22efc5dcaeb338c18cf0f4c1e Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 04:07:50 +0000
Subject: [PATCH] 1) add javadoc to AllZoneUtil.java 2) add CardList
 getPlayerHand(player); 3) update Glasses of Urza to use new function

---
 src/forge/AllZoneUtil.java | 30 ++++++++++++++++++++++++++++++
 src/forge/CardFactory.java |  5 ++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/forge/AllZoneUtil.java b/src/forge/AllZoneUtil.java
index c8dd6871193..57e03f54166 100644
--- a/src/forge/AllZoneUtil.java
+++ b/src/forge/AllZoneUtil.java
@@ -97,6 +97,12 @@ public class AllZoneUtil {
 	
 	//////////GRAVEYARD
 	
+	/**
+	 * gets all cards in given player's graveyard
+	 * 
+	 * @param player the player whose graveyard we want to get
+	 * @return a CardList containing all cards in that player's graveyard
+	 */
 	public static CardList getPlayerGraveyard(final String player) {
 		CardList cards = new CardList();
 		if( player.equals(Constant.Player.Human) || player.equals(Constant.Player.Computer) ){
@@ -106,10 +112,34 @@ public class AllZoneUtil {
 		return cards;
 	}
 	
+	/**
+	 * gets a list of all cards with a given name in a certain player's graveyard
+	 * 
+	 * @param player the player whose graveyard we want to get
+	 * @param cardName the card name to find in the graveyard
+	 * @return a CardList containing all cards with that name in the target graveyard
+	 */
 	public static CardList getPlayerGraveyard(final String player, final String cardName) {
 		CardList cards = new CardList();
 		cards = getPlayerGraveyard(player);
 		cards = cards.getName(cardName);
 		return cards;
 	}
+	
+	//////// HAND
+	
+	/**
+	 * gets a list of all cards in a given player's hand
+	 * 
+	 * @param player the player's hand to target
+	 * @return a CardList containing all cards in target player's hand
+	 */
+	public static CardList getPlayerHand(final String player) {
+		CardList cards = new CardList();
+		if( player.equals(Constant.Player.Human) || player.equals(Constant.Player.Computer) ){
+			PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, player);
+			cards.addAll(hand.getCards());
+		}
+		return cards;
+	}
 }
\ No newline at end of file
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index f473b0446d6..2a29d225be3 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -18592,9 +18592,8 @@ public class CardFactory implements NewConstants {
         		@Override
         		public void resolve() {
         			final String player = getTargetPlayer();
-        			PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, player);
-        			CardList handList = new CardList( hand.getCards());
-        			AllZone.Display.getChoice("Target player's hand", handList.toArray());
+        			CardList hand = AllZoneUtil.getPlayerHand(player);
+        			AllZone.Display.getChoice("Target player's hand", hand.toArray());
         		}
 
         		@Override