Fix trigger targeting itself (#6973)

Co-authored-by: tool4EvEr <[email protected]>
Card-Forge · Feb 5, 2025 · dee2150 · dee2150
1 parent c44b105
commit dee2150
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
@@ -132,7 +132,6 @@ else if (sa.hasParam("DefinedMagnet")) {
                                 source = changingTgtSA.getTargetCard();
                             }
                             Predicate<GameObject> filter = sa.hasParam("TargetRestriction") ? GameObjectPredicates.restriction(sa.getParam("TargetRestriction").split(","), activator, source, sa) : null;
-                            // TODO Creature.Other might not work yet as it should
                             TargetChoices newTarget = chooser.getController().chooseNewTargetsFor(changingTgtSA, filter, false);
                             changingTgtSI.updateTarget(newTarget, sa.getHostCard());
                         }

diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
@@ -1717,15 +1717,16 @@ public final Card playLandNoCheck(final Card land, SpellAbility cause) {
         final Card c = game.getAction().moveTo(getZone(ZoneType.Battlefield), land, cause);
         game.updateLastStateForCard(c);
 
-        // play a sound
-        game.fireEvent(new GameEventLandPlayed(this, land));
-
         // Run triggers
         runParams.put(AbilityKey.SpellAbility, cause);
         game.getTriggerHandler().runTrigger(TriggerType.LandPlayed, runParams, false);
+
         game.getStack().unfreezeStack();
         addLandPlayedThisTurn();
 
+        // play a sound
+        game.fireEvent(new GameEventLandPlayed(this, land));
+
         return c;
     }
 

diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -70,6 +70,7 @@
 import forge.game.staticability.StaticAbilityMustTarget;
 import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerType;
+import forge.game.trigger.WrappedAbility;
 import forge.game.zone.ZoneType;
 
 //only SpellAbility can go on the stack
@@ -1072,11 +1073,9 @@ public String getCostDescription() {
     }
 
     public void rebuiltDescription() {
-
         // SubAbilities don't have Costs or Cost descriptors
 
-        String sb = getCostDescription() +
-                getParam("SpellDescription");
+        String sb = getCostDescription() + getParam("SpellDescription");
         setDescription(sb);
     }
 
@@ -1991,7 +1990,11 @@ public final List<GameObject> getUniqueTargets() {
         return targets;
     }
 
-    public boolean canTargetSpellAbility(final SpellAbility topSA) {
+    public boolean canTargetSpellAbility(SpellAbility topSA) {
+        if (topSA.isWrapper()) {
+            topSA = ((WrappedAbility) topSA).getWrappedAbility();
+        }
+
         final TargetRestrictions tgt = getTargetRestrictions();
 
         if (this.equals(topSA)) {

diff --git a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
@@ -323,7 +323,7 @@ public String yieldKey() {
     // a real solution would include only the triggering information that actually is used, but that's a major change
     @Override
     public String toUnsuppressedString() {
-        String desc = this.getStackDescription(); /* use augmented stack description as string for wrapped things */
+        String desc = this.getStackDescription(false); /* use augmented stack description as string for wrapped things */
         String card = getHostCard().toString();
         if (!desc.contains(card) && desc.contains(" this ")) { /* a hack for Evolve and similar that don't have CARDNAME */
                 return card + ": " + desc;
@@ -332,15 +332,23 @@ public String toUnsuppressedString() {
 
     @Override
     public String getStackDescription() {
+        return getStackDescription(true);
+    }
+
+    public String getStackDescription(boolean withTargets) {
         final Trigger regtrig = getTrigger();
         if (regtrig == null) return "";
         final StringBuilder sb =
                 new StringBuilder(regtrig.replaceAbilityText(regtrig.toString(true), this, true));
-        List<TargetChoices> allTargets = sa.getAllTargetChoices();
-        if (!allTargets.isEmpty() && !ApiType.Charm.equals(sa.getApi())) {
-            sb.append(" (Targeting: ");
-            sb.append(allTargets);
-            sb.append(")");
+
+        // prevent text growing too long when SA target other in a chain and also potential StackOverflow
+        if (withTargets) {
+            List<TargetChoices> allTargets = sa.getAllTargetChoices();
+            if (!allTargets.isEmpty() && !ApiType.Charm.equals(sa.getApi())) {
+                sb.append(" (Targeting: ");
+                sb.append(allTargets);
+                sb.append(")");
+            }
         }
 
         String important = regtrig.getImportantStackObjects(this);