From 5fa69cb8a9fe94aa979177101dc324d0c8b43099 Mon Sep 17 00:00:00 2001
From: L_J <Zzooouhh@users.noreply.github.com>
Date: Thu, 7 Jun 2018 15:41:47 +0000
Subject: [PATCH] More X cost rollback related fixes

---
 .../main/java/mage/abilities/costs/mana/ManaCostsImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java
index 303384dafc0..dbf25f6df43 100644
--- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java
+++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java
@@ -333,13 +333,13 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
     private void handleForcedToPayOnlyForCurrentPayment(Game game, ManaPool pool, ManaCosts referenceCosts) {
         // for Word of Command
         if (pool.isForcedToPay()) {
-            if (referenceCosts != null && this.getPayment().equals(referenceCosts.getPayment())) {
+            if (referenceCosts != null && this.getText().equals(referenceCosts.getText())) {
                 UUID playerId = pool.getPlayerId();
                 Player player = game.getPlayer(playerId);
                 if (player != null) {
                     game.undo(playerId);
                     this.clearPaid();
-                    this.setX(0);
+                    this.setX(referenceCosts.getX());
                     player.getManaPool().restoreMana(pool.getPoolBookmark());
                     game.bookmarkState();
                 }