From c918de2fd9d570e38a6b4cc0e6db01219c94233b Mon Sep 17 00:00:00 2001 From: mo Date: Tue, 4 Jun 2019 21:30:48 -0600 Subject: do not declare winner until at least one player has won a round --- src/Q2/RockPaperScissorsLizardSpock.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Q2/RockPaperScissorsLizardSpock.java') diff --git a/src/Q2/RockPaperScissorsLizardSpock.java b/src/Q2/RockPaperScissorsLizardSpock.java index 715dcb4..216c40a 100644 --- a/src/Q2/RockPaperScissorsLizardSpock.java +++ b/src/Q2/RockPaperScissorsLizardSpock.java @@ -45,9 +45,10 @@ public class RockPaperScissorsLizardSpock { this.delcareRoundWinner(winner); this.incrementWinsFor(winner); - this.puts("Player %d has %d consecutive wins.", this.lastWinner, this.consecutiveWins); + if (this.lastWinner > 0) + this.puts("Player %d has %d consecutive wins.", this.lastWinner, this.consecutiveWins); - if (this.consecutiveWins == 4) { + if (this.lastWinner > 0 && this.consecutiveWins == 4) { this.declareWinner(); return; } @@ -107,6 +108,8 @@ public class RockPaperScissorsLizardSpock { } private void incrementWinsFor(int winner) { + if (winner == 0) return; + if (this.lastWinner == winner) { this.consecutiveWins++; } else if (winner > 0) { -- cgit v1.2.3