Merge branch 'controllspellfix' into 'master'

ControlSpell: fix for suspend

See merge request core-developers/forge!6329
This commit is contained in:
Anthony Calosa
2022-03-02 22:34:37 +00:00
2 changed files with 3 additions and 1 deletions

View File

@@ -87,6 +87,7 @@ public class ControlSpellEffect extends SpellAbilityEffect {
source.addRemembered(c);
}
c.addTempController(si.getActivatingPlayer(), tStamp);
c.runChangeControllerCommands();
}
}
@@ -98,6 +99,7 @@ public class ControlSpellEffect extends SpellAbilityEffect {
source.addRemembered(tgtC);
}
tgtC.addTempController(newController, tStamp);
tgtC.runChangeControllerCommands();
si.setActivatingPlayer(newController);
}
}

View File

@@ -1829,7 +1829,7 @@ public class CardFactoryUtil {
playTrig.append(" | TriggerDescription$ When the last time counter is removed from this card, if it's exiled, play it without paying its mana cost if able. ");
playTrig.append("If you can't, it remains exiled. If you cast a creature spell this way, it gains haste until you lose control of the spell or the permanent it becomes.");
String abPlay = "DB$ Play | Defined$ Self | WithoutManaCost$ True | SuspendCast$ True";
String abPlay = "DB$ Play | Defined$ Self | WithoutManaCost$ True";
if (card.isPermanent()) {
abPlay += "| RememberPlayed$ True";
}