From beadafd2d95cf4c22c97be6d95179ae8da214e33 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Wed, 8 Jun 2016 17:11:11 +0000
Subject: [PATCH] Zone: do not add Tokens to the cardList if its not the
 Battlefield that does fix The Great Aurora

---
 .../src/main/java/forge/game/zone/Zone.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java
index bf33e48ff44..2cfc5e85ef8 100644
--- a/forge-game/src/main/java/forge/game/zone/Zone.java
+++ b/forge-game/src/main/java/forge/game/zone/Zone.java
@@ -91,13 +91,16 @@ public class Zone implements java.io.Serializable, Iterable<Card> {
         if (zoneType != ZoneType.Battlefield) {
             c.setTapped(false);
         }
-        c.setZone(this);
 
-        if (index == null) {
-            cardList.add(c);
-        }
-        else {
-            cardList.add(index.intValue(), c);
+        // Do not add Tokens to other zones than the battlefield.
+        if (zoneType == ZoneType.Battlefield || !c.isToken()) {
+            c.setZone(this);
+
+            if (index == null) {
+                cardList.add(c);
+            } else {
+                cardList.add(index.intValue(), c);
+            }
         }
         onChanged();
         game.fireEvent(new GameEventZone(zoneType, getPlayer(), EventValueChangeType.Added, c));