From afa42a53cdbea5adfdb49df2029490811ec8cbb6 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Tue, 30 Jul 2013 11:15:51 +0000
Subject: [PATCH] - Fixed tokens leaving the battlefield not unpairing.

---
 src/main/java/forge/game/GameAction.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index 647d6dce2d8..b64761e2df0 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -269,13 +269,16 @@ public class GameAction {
             copied.getCharacteristics().resetCardColor();
         }
 
-        if (fromBattlefield && !c.isToken()) {
-            copied.setSuspendCast(false);
-            copied.setState(CardCharacteristicName.Original);
+        if (fromBattlefield) {
+            if (!c.isToken()) {
+                copied.setSuspendCast(false);
+                copied.setState(CardCharacteristicName.Original);
+            }
             // Soulbond unpairing
             if (c.isPaired()) {
                 c.getPairedWith().setPairedWith(null);
-                c.setPairedWith(null);
+                if (!c.isToken())
+                    c.setPairedWith(null);
             }
             unattachCardLeavingBattlefield(copied);
         } else if (zoneFrom.is(ZoneType.Exile) && !toBattlefield) {