From 0f0bae08ebb1f2c53265f7622c39e930c39aa8a7 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 17:04:25 +0000
Subject: [PATCH] - Fix for getCardState causing an NPE when tokens cease to
 exist

---
 src/forge/AllZoneUtil.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/forge/AllZoneUtil.java b/src/forge/AllZoneUtil.java
index 675bd9ad9ad..0424dd63242 100644
--- a/src/forge/AllZoneUtil.java
+++ b/src/forge/AllZoneUtil.java
@@ -413,9 +413,12 @@ public class AllZoneUtil {
 	}
 	
 	public static Card getCardState(Card card){
-		CardList zone = getCardsInZone(AllZone.getZone(card).getZoneName());
+		PlayerZone zone = AllZone.getZone(card);
+		if (zone == null)	// for tokens
+			return null;
 		
-		for(Card c : zone){
+		CardList list = getCardsInZone(zone.getZoneName());
+		for(Card c : list){
 			if (card.equals(c))
 				return c;
 		}