From 8827e9723c9d4f35d9c6256377f934ae215348a2 Mon Sep 17 00:00:00 2001
From: Adam Pantel <adam.pantel@nextgenvest.com>
Date: Sat, 13 Apr 2019 17:11:17 -0400
Subject: [PATCH 1/2] Try to fix Grip of Chaos

---
 .../src/main/java/forge/game/ability/SpellAbilityEffect.java     | 1 +
 forge-game/src/main/java/forge/game/trigger/TriggerType.java     | 1 +
 forge-game/src/main/java/forge/game/zone/MagicStack.java         | 1 +
 forge-gui/res/cardsfolder/g/grip_of_chaos.txt                    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index 83c102a99ee..5ef77651bcb 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -196,6 +196,7 @@ public abstract class SpellAbilityEffect {
     protected final static List<SpellAbility> getDefinedSpellsOrTargeted(final SpellAbility sa, final String definedParam) { return getSpells(true,  definedParam, sa); }
 
     private static List<SpellAbility> getSpells(final boolean definedFirst, final String definedParam, final SpellAbility sa) {
+        System.out.println("usesTargeting "+sa.usesTargeting());
         final boolean useTargets = sa.usesTargeting() && (!definedFirst || !sa.hasParam(definedParam));
         return useTargets ? Lists.newArrayList(sa.getTargets().getTargetSpells()) 
                 : AbilityUtils.getDefinedSpellAbilities(sa.getHostCard(), sa.getParam(definedParam), sa);
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerType.java b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
index 00e568f24e1..113235102b4 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerType.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
@@ -79,6 +79,7 @@ public enum TriggerType {
     SetInMotion(TriggerSetInMotion.class),
     Shuffled(TriggerShuffled.class),
     SpellAbilityCast(TriggerSpellAbilityCast.class),
+    SpellAbilityCopy(TriggerSpellAbilityCopy.class),
     SpellCast(TriggerSpellAbilityCast.class),
     SpellCopy(TriggerSpellAbilityCopy.class),
     Surveil(TriggerSurveil.class),
diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index e4ce43685cd..5a8545c3bca 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -404,6 +404,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             if (sp.isSpell()) {
                 game.getTriggerHandler().runTrigger(TriggerType.SpellCopy, runParams, false);
             }
+            game.getTriggerHandler().runTrigger(TriggerType.SpellAbilityCopy, runParams, false);
         }
 
         // Run BecomesTarget triggers
diff --git a/forge-gui/res/cardsfolder/g/grip_of_chaos.txt b/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
index 45948de78f9..95f69ec3fac 100644
--- a/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
+++ b/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
@@ -1,6 +1,7 @@
 Name:Grip of Chaos
 ManaCost:4 R R
 Types:Enchantment
+T:Mode$ SpellAbilityCopy | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
 T:Mode$ SpellAbilityCast | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
 SVar:TrigChangeTarget:DB$ ChangeTargets | Defined$ TriggeredSpellAbility | RandomTarget$ True
 AI:RemoveDeck:Random

From 72f75eb797cb33ab2c85d28c6c0376cf09f9165a Mon Sep 17 00:00:00 2001
From: adampantel <adam.pantel@commonbond.co>
Date: Mon, 15 Apr 2019 13:39:07 -0400
Subject: [PATCH 2/2] Remove extra println

---
 .../src/main/java/forge/game/ability/SpellAbilityEffect.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index 5ef77651bcb..83c102a99ee 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -196,7 +196,6 @@ public abstract class SpellAbilityEffect {
     protected final static List<SpellAbility> getDefinedSpellsOrTargeted(final SpellAbility sa, final String definedParam) { return getSpells(true,  definedParam, sa); }
 
     private static List<SpellAbility> getSpells(final boolean definedFirst, final String definedParam, final SpellAbility sa) {
-        System.out.println("usesTargeting "+sa.usesTargeting());
         final boolean useTargets = sa.usesTargeting() && (!definedFirst || !sa.hasParam(definedParam));
         return useTargets ? Lists.newArrayList(sa.getTargets().getTargetSpells()) 
                 : AbilityUtils.getDefinedSpellAbilities(sa.getHostCard(), sa.getParam(definedParam), sa);