From d65d6ee16a7dfe4dee9cf3dfaa880e9e2f6ff0e7 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sat, 13 Sep 2014 13:24:51 +0000
Subject: [PATCH] - A better and more correct fix for X propagation.

---
 .../java/forge/player/HumanPlaySpellAbility.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
index f2df9a15b47..06eec5c7f33 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
@@ -234,14 +234,13 @@ public class HumanPlaySpellAbility {
             }
 
             ability.setSVar("X", value.toString());
-            
-            // announce to subabilities
-            SpellAbility sub = ability.getSubAbility();
-            do {
-                sub.setSVar("X", value.toString());
-            } while ((sub = sub.getSubAbility()) != null);
-
             card.setSVar("X", value.toString());
+
+            // announce to subabilities
+            SpellAbility sub = ability;
+            while ((sub = sub.getSubAbility()) != null) {
+                sub.setSVar("X", value.toString());
+            };
         }
         return true;
     }