Aligning both can*KingCastle methods.

skytreader · Oct 21, 2014 · f70fd2a · f70fd2a
1 parent 9d6c0a5
commit f70fd2a
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/main/java/net/skytreader/kode/chesstemplar/GameArbiter.java b/src/main/java/net/skytreader/kode/chesstemplar/GameArbiter.java
@@ -116,8 +116,26 @@ public boolean canWhiteKingCastle(){
     @return The answer to the question above.
     */
     public boolean canBlackKingCastle(){
-        return (!blackKingMoved && !blackKingsideRookMoved) ||
-          (!blackKingMoved && !blackQueensideRookMoved);
+        boolean kingSideClear = true;
+        boolean queenSideClear = true;
+
+        // Check if the king side is clear
+        for(int i = 5; i < 7; i++){
+            if(board.getPieceAt(0, i) != null){
+                kingSideClear = false;
+                break;
+            }
+        }
+
+        // Check if the queen side is clear
+        for(int i = 1; i < 5; i++){
+            if(board.getPieceAt(0, i) != null){
+                queenSideClear = false;
+                break;
+            }
+        }
+        return (!blackKingMoved && !blackKingsideRookMoved && kingSideClear) ||
+          (!blackKingMoved && !blackQueensideRookMoved && queenSideClear);
     }
 
     public boolean isWhiteKingChecked(){