From 96ccf0afc66729e78fa8b94742c8a261b6663dbb Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 9 Jun 2021 09:43:02 +0200
Subject: [PATCH] More small fixes

---
 .../StaticAbilityCantBeCast.java              | 19 ++++++++++---------
 forge-gui/res/cardsfolder/g/gravestorm.txt    |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
index 9c84816a495..cf2b9f664c6 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java
@@ -57,14 +57,16 @@ public class StaticAbilityCantBeCast {
     }
 
     public static boolean cantBeActivatedAbility(final SpellAbility spell, final Card card, final Player activator) {
-        final Game game = activator.getGame();
-        for (final Card ca : game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
-            for (final StaticAbility stAb : ca.getStaticAbilities()) {
-                if (!stAb.getParam("Mode").equals(CantBeActivated) || stAb.isSuppressed() || !stAb.checkConditions()) {
-                    continue;
-                }
-                if (applyCantBeActivatedAbility(stAb, spell, card, activator)) {
-                    return true;
+        if (!spell.isTrigger()) {
+            final Game game = activator.getGame();
+            for (final Card ca : game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
+                for (final StaticAbility stAb : ca.getStaticAbilities()) {
+                    if (!stAb.getParam("Mode").equals(CantBeActivated) || stAb.isSuppressed() || !stAb.checkConditions()) {
+                        continue;
+                    }
+                    if (applyCantBeActivatedAbility(stAb, spell, card, activator)) {
+                        return true;
+                    }
                 }
             }
         }
@@ -153,7 +155,6 @@ public class StaticAbilityCantBeCast {
      * @return true, if successful
      */
     public static boolean applyCantBeActivatedAbility(final StaticAbility stAb, final SpellAbility spellAbility, final Card card, final Player activator) {
-
         if (!stAb.matchesValidParam("ValidCard", card)) {
             return false;
         }
diff --git a/forge-gui/res/cardsfolder/g/gravestorm.txt b/forge-gui/res/cardsfolder/g/gravestorm.txt
index c3a40e6a1e6..ea4fa497546 100644
--- a/forge-gui/res/cardsfolder/g/gravestorm.txt
+++ b/forge-gui/res/cardsfolder/g/gravestorm.txt
@@ -2,7 +2,7 @@ Name:Gravestorm
 ManaCost:B B B
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigChangeZone | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, target opponent may exile a card from their graveyard. If that player doesn't, you may draw a card.
-SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.YouDontCtrl | ChangeNum$ 1 | Hidden$ True | Chooser$ Targeted | RememberChanged$ True | Optional$ Targeted | IsCurse$ True | SubAbility$ DBDraw
+SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.TargetedPlayerCtrl | ChangeNum$ 1 | Hidden$ True | Chooser$ Targeted | RememberChanged$ True | Optional$ Targeted | IsCurse$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | Defined$ You | OptionalDecider$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount