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

- Added a default player to getDefendingPlayer (the player whose turn it is not), if the variable has not been set.

Browse Source
This commit is contained in:
Sloth
2011-11-04 11:22:02 +00:00
parent 5abb423083
commit f158995bae
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/Combat.java
View File

@@ -231,7 +231,7 @@ public class Combat {
if (attackingPlayer != null) { if (attackingPlayer != null) {
return attackingPlayer; return attackingPlayer;
} }
else return AllZone.getPhase().getPriorityPlayer(); else return AllZone.getPhase().getPlayerTurn();
} }
/** /**
@@ -242,7 +242,10 @@ public class Combat {
* @return a {@link forge.Player} object. * @return a {@link forge.Player} object.
*/ */
public final Player getDefendingPlayer() { public final Player getDefendingPlayer() {
return defendingPlayer; if (attackingPlayer != null) {
return defendingPlayer;
}
else return AllZone.getPhase().getPlayerTurn().getOpponent();
} }
/** /**