Merge branch 'colfenor' into 'master'

CMR: Colfenor, the Last Yew and RememberTriggeringCard!!!

See merge request core-developers/forge!3316
This commit is contained in:
Michael Kamensky
2020-11-01 04:37:19 +00:00
2 changed files with 18 additions and 0 deletions

View File

@@ -573,6 +573,11 @@ public class TriggerHandler {
host.addRemembered(sa.getActivatingPlayer());
}
if (regtrig.hasParam("RememberTriggeringCard")) {
Card triggeredCard = ((Card) sa.getTriggeringObject(AbilityKey.Card));
host.addRemembered(triggeredCard);
}
sa.setStackDescription(sa.toString());
if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) {
// need to be set for demonic pact to look for chosen modes