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

Merge branch 'sim-draw-npe' into 'master'

Browse Source 
fix sw.stop bug, added draw condition for timeouts and both players life 0

See merge request core-developers/forge!3251
This commit is contained in:
Michael Kamensky
2020-10-08 14:16:20 +00:00
parent 6d62159e3e 715aec7e54
commit 34d27d628b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
View File

@@ -203,10 +203,8 @@ public class SimulateMatch {
}
// If both players life totals to 0 in a single turn, the game should end in a draw
if(g1.getOutcome().getLifeDelta() == 0){
g1.setGameOver(GameEndReason.Draw);
if(g1.getOutcome().isDraw()){
System.out.println(String.format("Game %d ended in a Draw! Took %d ms.", 1+iGame, sw.getTime()));
sw.stop();
} else {
System.out.println(String.format("\nGame %d ended in %d ms. %s has won!\n", 1+iGame, sw.getTime(), g1.getOutcome().getWinningLobbyPlayer().getName()));
}