diff --git a/OOP_3B5_Project/src/backend/Move.java b/OOP_3B5_Project/src/backend/Move.java index 50c8895..71c5dad 100644 --- a/OOP_3B5_Project/src/backend/Move.java +++ b/OOP_3B5_Project/src/backend/Move.java @@ -237,37 +237,59 @@ public class Move { } if (selectX == x - 1 && selectY == y - 2) { + + if(board.getPiece(x, y) != null) { + return color != board.getPiece(x, y).isWhite(); + } return true; } if (selectX == x - 1 && selectY == y + 2) { - return true; + if(board.getPiece(x, y) != null) { + return color != board.getPiece(x, y).isWhite(); + } + return true; } if (selectX == x + 1 && selectY == y - 2) { - return true; + if(board.getPiece(x, y) != null) { + return color != board.getPiece(x, y).isWhite(); + } + return true; } if (selectX == x + 2 && selectY == y + 1) { - return true; + if(board.getPiece(x, y) != null) { + return color != board.getPiece(x, y).isWhite(); + } + return true; } if (selectX == x - 2 && selectY == y - 1) { - return true; + if(board.getPiece(x, y) != null) { + return color != board.getPiece(x, y).isWhite(); + } + return true; } if (selectX == x - 2 && selectY == y + 1) { - return true; + if(board.getPiece(x, y) != null) { + return color != board.getPiece(x, y).isWhite(); + } + return true; } if (selectX == x + 2 && selectY == y - 1) { - return true; + if(board.getPiece(x, y) != null) { + return color != board.getPiece(x, y).isWhite(); + } + return true; } return false;