From ec6ed8cea5a5b92ff6fabf7502180f242dbfb4a9 Mon Sep 17 00:00:00 2001
From: Adam Pantel <>
Date: Fri, 2 Apr 2021 00:31:49 -0400
Subject: [PATCH] Remove redundant checks

---
 .../java/forge/game/ability/AbilityKey.java   |  1 -
 .../TriggerSpellAbilityCastOrCopy.java        | 26 -------------------
 .../main/java/forge/game/zone/MagicStack.java |  2 --
 3 files changed, 29 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/AbilityKey.java b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
index be0632c1ccc..12b138c40f6 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityKey.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
@@ -25,7 +25,6 @@ public enum AbilityKey {
     AttackedTarget("AttackedTarget"),
     Blocker("Blocker"),
     Blockers("Blockers"),
-    CastOrCopy("CastOrCopy"),
     CastSA("CastSA"),
     CastSACMC("CastSACMC"),
     Card("Card"),
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java
index 41078435d3f..58b017c51f4 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java
@@ -80,32 +80,6 @@ public class TriggerSpellAbilityCastOrCopy extends Trigger {
         final Card cast = spellAbility.getHostCard();
         final Game game = cast.getGame();
         final SpellAbilityStackInstance si = game.getStack().getInstanceFromSpellAbility(spellAbility);
-        String castOrCopy = (String) runParams.get(AbilityKey.CastOrCopy);
-
-        // Specific checks for trigger types
-        if (castOrCopy.equals("Copy")) {
-            if (this.getMode().equals(TriggerType.AbilityCast) ||
-                    this.getMode().equals(TriggerType.SpellAbilityCast) ||
-                    this.getMode().equals(TriggerType.SpellCast)) {
-                return false;
-            }
-        } else if (castOrCopy.equals("Cast")) {
-            if (this.getMode().equals(TriggerType.SpellAbilityCopy) ||
-                    this.getMode().equals(TriggerType.SpellCopy)) {
-                return false;
-            }
-        }
-        if (spellAbility.isSpell()) {
-            if (this.getMode().equals(TriggerType.AbilityCast)) {
-                return false;
-            }
-        } else if (spellAbility.isAbility()) {
-            if (this.getMode().equals(TriggerType.SpellCast) ||
-                    this.getMode().equals(TriggerType.SpellCopy) ||
-                    this.getMode().equals(TriggerType.SpellCastOrCopy)) {
-                return false;
-            }
-        }
 
         if (hasParam("ActivatedOnly")) {
             if (spellAbility.isTrigger()) {
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 1db5c8c21c4..38a022a6f4c 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -301,7 +301,6 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         runParams.put(AbilityKey.CurrentStormCount, thisTurnCast.size());
         runParams.put(AbilityKey.CurrentCastSpells, Lists.newArrayList(thisTurnCast));
         if (!sp.isCopied()) {
-            runParams.put(AbilityKey.CastOrCopy, "Cast");
             // Run SpellAbilityCast triggers
             game.getTriggerHandler().runTrigger(TriggerType.SpellAbilityCast, runParams, true);
             
@@ -334,7 +333,6 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
                 game.getTriggerHandler().runTrigger(TriggerType.Crewed, runParams, false);
             }
         } else {
-            runParams.put(AbilityKey.CastOrCopy, "Copy");
             // Run Copy triggers
             if (sp.isSpell()) {
                 game.getTriggerHandler().runTrigger(TriggerType.SpellCopy, runParams, false);