From b67efa4a01b173637f375d47c28fc8f608402a94 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Wed, 2 Nov 2016 13:46:57 +0000
Subject: [PATCH] CardFactory: fixed setting ActivatingPlayer

---
 forge-game/src/main/java/forge/game/card/CardFactory.java | 4 +++-
 1 file changed, 3 insertions(+), 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 06cca838cf0..0335ae96977 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -643,7 +643,9 @@ public class CardFactory {
     }
 
     public static void copySpellAbility(SpellAbility from, SpellAbility to) {
-        to.setActivatingPlayer(from.getActivatingPlayer());
+        if (from.getActivatingPlayer() != null) {
+            to.setActivatingPlayer(from.getActivatingPlayer());
+        }
         to.setDescription(from.getDescription());
         to.setStackDescription(from.getDescription());