Fix Boneyard Scourge triggering from itself dying (Card-Forge#4924)

Jorilx · Mar 31, 2024 · 247ec8c · 247ec8c
1 parent 7254b26
commit 247ec8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
@@ -30,6 +30,7 @@
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardCollectionView;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.spellability.SpellAbility;
@@ -99,6 +100,14 @@ public final boolean performTest(final Map<AbilityKey, Object> runParams) {
             }
         }
 
+        if ("Battlefield".equals(getParam("Origin")) && getActiveZone() != null && getActiveZone().contains(ZoneType.Graveyard)) {
+            // extra check for Boneyard Scourge
+            CardCollectionView lastState = (CardCollectionView) runParams.get(AbilityKey.LastStateGraveyard);
+            if (!lastState.contains(getHostCard())) {
+                return false;
+            }
+        }
+
         if (hasParam("ValidCard")) {
             Card moved = (Card) runParams.get(AbilityKey.Card);
 

diff --git a/forge-gui/res/cardsfolder/b/boneyard_scourge.txt b/forge-gui/res/cardsfolder/b/boneyard_scourge.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Creature Zombie Dragon
 PT:4/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Dragon.YouCtrl | IsPresent$ Card.StrictlySelf+inZoneGraveyard | PresentZone$ Graveyard | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ Whenever a Dragon you control dies while CARDNAME is in your graveyard, you may pay {1}{B}. If you do, return CARDNAME from your graveyard to the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Dragon.YouCtrl | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ Whenever a Dragon you control dies while CARDNAME is in your graveyard, you may pay {1}{B}. If you do, return CARDNAME from your graveyard to the battlefield.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 1 B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
 SVar:SacMe:1
 SVar:DiscardMe:1