From 2ab802f4138741fcfadf1a3e845007e64ee28373 Mon Sep 17 00:00:00 2001
From: elcnesh <elcnesh@cardforge.org>
Date: Tue, 8 Jul 2014 09:57:42 +0000
Subject: [PATCH] Fix NPE when dealing with copied tokens.

---
 forge-game/src/main/java/forge/game/card/CardFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java
index 8f1157d95df..9f9972c3fc7 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -72,7 +72,7 @@ public class CardFactory {
      */
     public final static Card copyCard(final Card in, boolean assignNewId) {
         Card out;
-        if (!in.isToken() || in.isCopiedToken()) {
+        if (!(in.isToken() || in.isCopiedToken())) {
             out = assignNewId ? getCard(in.getPaperCard(), in.getOwner()) 
                               : getCard(in.getPaperCard(), in.getOwner(), in.getUniqueNumber());
         } else { // token