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

- Fixed attackingPlayer sometimes not being set.

Browse Source
This commit is contained in:
Sloth
2013-04-26 20:36:33 +00:00
parent 5c6f8e89a9
commit b25d3bb673
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/game/phase/Combat.java
View File

@@ -84,7 +84,7 @@ public class Combat {
this.unblocked.clear(); this.unblocked.clear();
this.defendingDamageMap.clear(); this.defendingDamageMap.clear();
this.attackingPlayer = null; this.attackingPlayer = playerTurn;
this.initiatePossibleDefenders(playerTurn.getOpponents()); this.initiatePossibleDefenders(playerTurn.getOpponents());
} }

1
src/main/java/forge/game/phase/PhaseUtil.java
View File

@@ -89,7 +89,6 @@ public class PhaseUtil {
CMessage.SINGLETON_INSTANCE.updateGameInfo(Singletons.getModel().getMatch()); CMessage.SINGLETON_INSTANCE.updateGameInfo(Singletons.getModel().getMatch());
game.getCombat().reset(turn); game.getCombat().reset(turn);
game.getCombat().setAttackingPlayer(turn);
// Tokens starting game in play should suffer from Sum. Sickness // Tokens starting game in play should suffer from Sum. Sickness
final List<Card> list = turn.getCardsIncludePhasingIn(ZoneType.Battlefield); final List<Card> list = turn.getCardsIncludePhasingIn(ZoneType.Battlefield);