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

- Handle marked damage before the triggers are unsuppressed when applying game states.

Browse Source
This commit is contained in:
Agetian
2017-07-30 10:19:46 +00:00
parent 85e66ebd8a
commit 39eb6482e3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/GameState.java
View File

@@ -347,6 +347,7 @@ public abstract class GameState {
setupPlayerState(computerLife, aiCardTexts, ai); setupPlayerState(computerLife, aiCardTexts, ai);
handleCardAttachments(); handleCardAttachments();
handleMarkedDamage();
game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone); game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
game.getTriggerHandler().clearSuppression(TriggerType.DamageDone); game.getTriggerHandler().clearSuppression(TriggerType.DamageDone);
@@ -355,7 +356,9 @@ public abstract class GameState {
game.getStack().setResolving(false); game.getStack().setResolving(false);
game.getAction().checkStateEffects(true); //ensure state based effects and triggers are updated game.getAction().checkStateEffects(true); //ensure state based effects and triggers are updated
}
private void handleMarkedDamage() {
for (Entry<Card, Integer> entry : markedDamage.entrySet()) { for (Entry<Card, Integer> entry : markedDamage.entrySet()) {
Card c = entry.getKey(); Card c = entry.getKey();
Integer dmg = entry.getValue(); Integer dmg = entry.getValue();