From 87b8ac38f24ab779e601f3b0ab638e2bc301e687 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@gmx.de>
Date: Sat, 5 May 2018 18:47:20 +0200
Subject: [PATCH] Fix: fixed MayFlashSac

---
 forge-game/src/main/java/forge/game/GameActionUtil.java    | 7 +++----
 .../src/main/java/forge/game/card/CardFactoryUtil.java     | 7 ++++---
 .../src/main/java/forge/game/spellability/Spell.java       | 1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java
index 9f100673649..d2b285ec43e 100644
--- a/forge-game/src/main/java/forge/game/GameActionUtil.java
+++ b/forge-game/src/main/java/forge/game/GameActionUtil.java
@@ -201,10 +201,9 @@ public final class GameActionUtil {
                     } else {
                         sb.append(host);
                     }
-
-                    if (o.getAbility().hasParam("MayPlayText")) {
-                        sb.append(" (").append(o.getAbility().getParam("MayPlayText")).append(")");
-                    }
+                }
+                if (o.getAbility().hasParam("MayPlayText")) {
+                    sb.append(" (").append(o.getAbility().getParam("MayPlayText")).append(")");
                 }
                 sb.append(o.toString(false));
                 newSA.setDescription(sb.toString());
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 32f54834ba6..e6539b3c89b 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -3042,6 +3042,7 @@ public class CardFactoryUtil {
             SpellAbility saDelay = AbilityFactory.getAbility(strDelay, card);
             saDelay.setAdditionalAbility("Execute", (AbilitySub) AbilityFactory.getAbility(strSac, card));
             final Trigger trigger = TriggerHandler.parseTrigger(strTrig.toString(), card, intrinsic);
+            trigger.setOverridingAbility(saDelay);
             inst.addTrigger(trigger);
         }
     }
@@ -4285,9 +4286,9 @@ public class CardFactoryUtil {
             effect = "Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ " + k[1]
                     + " | Description$ CARDNAME can't be blocked " + getTextForKwCantBeBlockedByType(keyword);
         } else if (keyword.equals("MayFlashSac")) {
-            effect = "Mode$ Continuous | EffectZone$ All | Affected$ Card.Self "
-                    + " | MayPlay$ True | MayPlayWithFlash$ True | AffectedZone$ Exile,Graveyard,Hand,Library,Stack "
-                    + " | Description$ " + inst.getReminderText();
+            effect = "Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | Secondary$ True"
+                + " | MayPlay$ True | MayPlayWithFlash$ True | MayPlayText$ Sacrifice at the next cleanup step"
+                + " | AffectedZone$ Exile,Graveyard,Hand,Library,Stack | Description$ " + inst.getReminderText();
         }
 
         if (effect != null) {
diff --git a/forge-game/src/main/java/forge/game/spellability/Spell.java b/forge-game/src/main/java/forge/game/spellability/Spell.java
index 8c3776139cf..f020ca3a612 100644
--- a/forge-game/src/main/java/forge/game/spellability/Spell.java
+++ b/forge-game/src/main/java/forge/game/spellability/Spell.java
@@ -23,7 +23,6 @@ import forge.card.CardStateName;
 import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
-import forge.game.card.CardLists;
 import forge.game.card.CardUtil;
 import forge.game.cost.Cost;
 import forge.game.cost.CostPayment;