finished refactor endTheGame

1 files changed, 8 insertions, 6 deletions

diff --git a/domain/src/main/java/mancala/domain/Bowl.java b/domain/src/main/java/mancala/domain/Bowl.java
index a7a2e78..a29b806 100644
--- a/domain/src/main/java/mancala/domain/Bowl.java
+++ b/domain/src/main/java/mancala/domain/Bowl.java
@@ -37,11 +37,7 @@ abstract class Bowl {
     }
 
     protected void endTheGame(Bowl startOfLoop, int scorePlayer, int scoreOpponent) {
-        if (isEmpty() == false) return;
-
-        if (getMyOwner().equals(startOfLoop.getMyOwner())) {
-            scorePlayer = scorePlayer + getMyStones();
-        } else scoreOpponent = scoreOpponent + getMyStones();
+        if (isEmpty() == false && getMyOwner().equals(startOfLoop.getMyOwner())) return;
 
         if (this.equals(startOfLoop)) {
 
@@ -56,7 +52,13 @@ abstract class Bowl {
             }
 
 
-        } else getNextBowl().endTheGame(startOfLoop, scorePlayer, scoreOpponent);
+        } else {
+            if (getMyOwner().equals(startOfLoop.getMyOwner())) {
+                scorePlayer = scorePlayer + getMyStones();
+            } else scoreOpponent = scoreOpponent + getMyStones();
+
+            getNextBowl().endTheGame(startOfLoop, scorePlayer, scoreOpponent);
+        }
     }