From ef36a5f2336f36f502a74538fa0d3d1cad064e27 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 2 Nov 2021 12:42:40 -0400
Subject: [PATCH] Disturb check for Enchantment

---
 .../src/main/java/forge/game/GameActionUtil.java      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java
index 4c2d19bf62d..c42a5e69277 100644
--- a/forge-game/src/main/java/forge/game/GameActionUtil.java
+++ b/forge-game/src/main/java/forge/game/GameActionUtil.java
@@ -178,10 +178,13 @@ public final class GameActionUtil {
                         final String[] k = keyword.split(":");
                         final Cost disturbCost = new Cost(k[1], true);
 
-                        final SpellAbility backSA = source.getAlternateState().getFirstAbility();
-                        SpellAbility newSA = source.getAlternateState().getType().isCreature() ?
-                                sa.copyWithManaCostReplaced(activator, disturbCost) :
-                                backSA.copyWithManaCostReplaced(activator, disturbCost);
+                        SpellAbility newSA;
+                        if (source.getAlternateState().getType().isEnchantment()) {
+                            newSA = source.getAlternateState().getFirstAbility().copyWithManaCostReplaced(activator,
+                                    disturbCost);
+                        } else {
+                            newSA = sa.copyWithManaCostReplaced(activator, disturbCost);
+                        }
                         newSA.setActivatingPlayer(activator);
 
                         newSA.putParam("PrecostDesc", "Disturb —");