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

Merge branch 'fixtrig' into 'master'

Browse Source 
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
parent 0ece4427b6 ba02ce9261
commit e9ff6ece35
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -1680,6 +1680,8 @@ public class GameAction {
final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(c); final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(c);
runParams.put(AbilityKey.Causer, activator); runParams.put(AbilityKey.Causer, activator);
game.getTriggerHandler().runTrigger(TriggerType.Destroyed, runParams, false); 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); final Card sacrificed = sacrificeDestroy(c, sa, table);
return sacrificed != null; return sacrificed != null;

1
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

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