From 39eb6482e3eacfa0ba1540d377775f5903f74b0c Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 30 Jul 2017 10:19:46 +0000 Subject: [PATCH] - Handle marked damage before the triggers are unsuppressed when applying game states. --- forge-ai/src/main/java/forge/ai/GameState.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java index fb2cdcc4699..abcfc6733f1 100644 --- a/forge-ai/src/main/java/forge/ai/GameState.java +++ b/forge-ai/src/main/java/forge/ai/GameState.java @@ -347,6 +347,7 @@ public abstract class GameState { setupPlayerState(computerLife, aiCardTexts, ai); handleCardAttachments(); + handleMarkedDamage(); game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone); game.getTriggerHandler().clearSuppression(TriggerType.DamageDone); @@ -355,7 +356,9 @@ public abstract class GameState { game.getStack().setResolving(false); game.getAction().checkStateEffects(true); //ensure state based effects and triggers are updated + } + private void handleMarkedDamage() { for (Entry entry : markedDamage.entrySet()) { Card c = entry.getKey(); Integer dmg = entry.getValue();