X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fbase_rules.js;h=69549525408d51fa349cac05fb2254db758c216b;hb=4a2093139089632727de4f510127ef186cab528e;hp=e91a43e86fb5e9654a194229c23a439704dc9e8a;hpb=173f11dc3119c842a58daa9d1e0afc67eeb0e4e8;p=vchess.git

diff --git a/client/src/base_rules.js b/client/src/base_rules.js
index e91a43e8..69549525 100644
--- a/client/src/base_rules.js
+++ b/client/src/base_rules.js
@@ -275,7 +275,7 @@ export const ChessRules = class ChessRules {
 
   // En-passant square, if any
   getEpSquare(moveOrSquare) {
-    if (!moveOrSquare) return undefined;
+    if (!moveOrSquare) return undefined; //TODO: necessary line?!
     if (typeof moveOrSquare === "string") {
       const square = moveOrSquare;
       if (square == "-") return undefined;
@@ -1071,8 +1071,10 @@ export const ChessRules = class ChessRules {
       }
       if (
         V.OnBoard(rx, ry) &&
+        this.board[rx][ry] != V.EMPTY &&
         this.getPiece(rx, ry) == piece &&
-        this.getColor(rx, ry) == color
+        this.getColor(rx, ry) == color &&
+        this.canTake([rx, ry], [x, y])
       ) {
         return true;
       }