Merge else-if

yadavvi91 · Sep 9, 2023 · e4e0015 · e4e0015
1 parent 6f83334
commit e4e0015
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/src/main/java/org/yadavvi/ConsoleGame.java b/src/main/java/org/yadavvi/ConsoleGame.java
@@ -33,27 +33,25 @@ public void play() {
 
             if (isAlreadyGuessed(lettersUsed, guess)) {
                 ui.showAlreadyGuessed(guesses);
-            } else {
-                if (isAlreadyGuessed(matched, guess)) {
-                    lettersUsed += guess;
-                    String newGuesses = "";
-                    for (int i = 0; i < word.length(); ++i) {
-                        if (word.charAt(i) == guess) {
-                            newGuesses += guess + " ";
-                        } else {
-                            newGuesses += mid(guesses, i * 2, 2);
-                        }
-                    }
-                    guesses = newGuesses;
-                    matched = matched.replace(guess, '_');
-                } else {
-                    lettersUsed += guess;
-                    badGuessCount++;
-                    if (badGuessCount == 6) {
-                        ui.showGallows(badGuessCount);
-                        break;
+            } else if (isAlreadyGuessed(matched, guess)) {
+                lettersUsed += guess;
+                String newGuesses = "";
+                for (int i = 0; i < word.length(); ++i) {
+                    if (word.charAt(i) == guess) {
+                        newGuesses += guess + " ";
+                    } else {
+                        newGuesses += mid(guesses, i * 2, 2);
                     }
                 }
+                guesses = newGuesses;
+                matched = matched.replace(guess, '_');
+            } else {
+                lettersUsed += guess;
+                badGuessCount++;
+                if (badGuessCount == 6) {
+                    ui.showGallows(badGuessCount);
+                    break;
+                }
             }
             if (isMatched(word, matched)) {
                 ui.showGallows(badGuessCount);