From 58f02d0bc16853f54879a0766f35249a1e2fde5d Mon Sep 17 00:00:00 2001
From: swordshine <swordshine@cardforge.org>
Date: Mon, 7 Apr 2014 05:06:17 +0000
Subject: [PATCH] - Fixed NPE caused by Jhoira Avatar

---
 forge-game/src/main/java/forge/game/GameAction.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 99ea1651838..dce4ceceb02 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -393,10 +393,10 @@ public class GameAction {
 
         c = changeZone(zoneFrom, zoneTo, c, position);
 
-        if (zoneTo.is(ZoneType.Stack)) {
-            c.setCastFrom(zoneFrom.getZoneType());
-        } else if (zoneFrom == null) {
+        if (zoneFrom == null) {
             c.setCastFrom(null);
+        } else if (zoneTo.is(ZoneType.Stack)) {
+            c.setCastFrom(zoneFrom.getZoneType());
         } else if (!(zoneTo.is(ZoneType.Battlefield) && zoneFrom.is(ZoneType.Stack))) {
             c.setCastFrom(null);
         }