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

Actual fix for Daredevil Dragster

Browse Source
This commit is contained in:
Sol
2017-03-28 02:48:46 +00:00
parent 84b06ef2d3
commit 3e05b2b520
2 changed files with 4 additions and 2 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

@@ -437,7 +437,9 @@ public class PhaseHandler implements java.io.Serializable {
eventEndCombat = new GameEventCombatEnded(attackers, blockers); eventEndCombat = new GameEventCombatEnded(attackers, blockers);
} }
endCombat(); endCombat();
playerTurn.resetAttackedThisCombat(); for(Player player : game.getPlayers()) {
player.resetCombatantsThisCombat();
}
if (eventEndCombat != null) { if (eventEndCombat != null) {
game.fireEvent(eventEndCombat); game.fireEvent(eventEndCombat);

2
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -2774,7 +2774,7 @@ public class Player extends GameEntity implements Comparable<Player> {
game.setActivePlanes(currentPlanes); game.setActivePlanes(currentPlanes);
} }
public final void resetAttackedThisCombat() { public final void resetCombatantsThisCombat() {
// resets the status of attacked/blocked this phase // resets the status of attacked/blocked this phase
CardCollectionView list = getCardsIn(ZoneType.Battlefield); CardCollectionView list = getCardsIn(ZoneType.Battlefield);