external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-12 00:38:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'controllspellfix' into 'master'

Browse Source 
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
parent a7c8885a41 544ca0780a
commit f223dc25e7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java
View File

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

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
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(" | 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."); 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()) { if (card.isPermanent()) {
abPlay += "| RememberPlayed$ True"; abPlay += "| RememberPlayed$ True";
} }