From 258a9c046e731a088a0f7f40394011738d72faad Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Wed, 4 Oct 2017 06:28:00 +0000
Subject: [PATCH] - Updated PlayMain1:ALWAYS to work for non-permanent spells.
 Updated Decree of Justice to avoid a different mechanism for the same
 purpose.

---
 forge-ai/src/main/java/forge/ai/ComputerUtil.java | 2 +-
 forge-gui/res/cardsfolder/d/decree_of_justice.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index ce4ae4f8161..a8a6a34f1cb 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -1112,7 +1112,7 @@ public class ComputerUtil {
         final Card source = sa.getHostCard();
         final SpellAbility sub = sa.getSubAbility();
 
-        if ("AlwaysCastInMain1".equals(sa.getParam("AILogic"))) {
+        if (source != null && "ALWAYS".equals(source.getSVar("PlayMain1"))) {
             return true;
         }
 
diff --git a/forge-gui/res/cardsfolder/d/decree_of_justice.txt b/forge-gui/res/cardsfolder/d/decree_of_justice.txt
index 94e784cce1d..425ccf6869b 100644
--- a/forge-gui/res/cardsfolder/d/decree_of_justice.txt
+++ b/forge-gui/res/cardsfolder/d/decree_of_justice.txt
@@ -2,10 +2,11 @@ Name:Decree of Justice
 ManaCost:X X 2 W W
 Types:Sorcery
 K:Cycling:2 W
-A:SP$ Token | Cost$ X X 2 W W | TokenAmount$ X | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | References$ X | AILogic$ AlwaysCastInMain1 | SpellDescription$ Create X 4/4 white Angel creature tokens with flying.
+A:SP$ Token | Cost$ X X 2 W W | TokenAmount$ X | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | References$ X | SpellDescription$ Create X 4/4 white Angel creature tokens with flying.
 T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ When you cycle CARDNAME, you may pay {X}. If you do, create X 1/1 white Soldier creature tokens.
 SVar:TrigToken:AB$ Token | Cost$ X | TokenAmount$ X | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | References$ X
 SVar:X:Count$xPaid
+SVar:PlayMain1:ALWAYS
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/decree_of_justice.jpg
 Oracle:Create X 4/4 white Angel creature tokens with flying.\nCycling {2}{W} ({2}{W}, Discard this card: Draw a card.)\nWhen you cycle Decree of Justice, you may pay {X}. If you do, create X 1/1 white Soldier creature tokens.