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

PhaseHandler: reset ActiveTriggers before the BattleTriggers are check.

Browse Source 
That does fix Finest Hour
This commit is contained in:
Hanmac
2016-10-11 16:46:10 +00:00
parent 4213e1269d
commit aa7e312229
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -513,6 +513,8 @@ public class PhaseHandler implements java.io.Serializable {
} }
nCombatsThisTurn++; nCombatsThisTurn++;
// Reset all active Triggers
game.getTriggerHandler().resetActiveTriggers();
// Prepare and fire event 'attackers declared' // Prepare and fire event 'attackers declared'
Multimap<GameEntity, Card> attackersMap = ArrayListMultimap.create(); Multimap<GameEntity, Card> attackersMap = ArrayListMultimap.create();
@@ -855,7 +857,7 @@ public class PhaseHandler implements java.io.Serializable {
} }
public final boolean isFirstCombat() { public final boolean isFirstCombat() {
return (nCombatsThisTurn == 0); return (nCombatsThisTurn == 1);
} }
public final boolean isFirstUpkeep() { public final boolean isFirstUpkeep() {