Merge branch 'fixtrig' into 'master'

Fix Karmic Justice

See merge request core-developers/forge!4613
This commit is contained in:
Hans Mackowiak
2021-04-28 21:12:08 +00:00
2 changed files with 4 additions and 1 deletions

View File

@@ -1680,6 +1680,8 @@ public class GameAction {
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(c);
runParams.put(AbilityKey.Causer, activator);
game.getTriggerHandler().runTrigger(TriggerType.Destroyed, runParams, false);
// in case the destroyed card has such a trigger
game.getTriggerHandler().registerActiveLTBTrigger(c);
final Card sacrificed = sacrificeDestroy(c, sa, table);
return sacrificed != null;

View File

@@ -237,6 +237,7 @@ public class TriggerHandler {
if (
TriggerType.Exploited.equals(t.getMode()) ||
TriggerType.Sacrificed.equals(t.getMode()) ||
TriggerType.Destroyed.equals(t.getMode()) ||
(TriggerType.ChangesZone.equals(t.getMode()) && "Battlefield".equals(t.getParam("Origin")))) {
registerOneTrigger(t);
}