X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCrazyhouse.js;h=2a95dc857b696c5308d996b2631fcc6eedb2f8b4;hb=ded43c88fad60fd8f9bb46aabd67f3f2092f65f3;hp=db9cb5778b6c868cf81044fa9c70a55e9ccc09fb;hpb=1e8a838649e16509c80c9933d99d78856e11b5c2;p=vchess.git

diff --git a/client/src/variants/Crazyhouse.js b/client/src/variants/Crazyhouse.js
index db9cb577..2a95dc85 100644
--- a/client/src/variants/Crazyhouse.js
+++ b/client/src/variants/Crazyhouse.js
@@ -80,9 +80,9 @@ export class CrazyhouseRules extends ChessRules {
 
   setOtherVariables(fen) {
     super.setOtherVariables(fen);
+    const fenParsed = V.ParseFen(fen);
     // Also init reserves (used by the interface to show landable pieces)
-    const reserve =
-      V.ParseFen(fen).reserve.split("").map(x => parseInt(x, 10));
+    const reserve = fenParsed.reserve.split("").map(x => parseInt(x, 10));
     this.reserve = {
       w: {
         [V.PAWN]: reserve[0],
@@ -185,17 +185,15 @@ export class CrazyhouseRules extends ChessRules {
   }
 
   atLeastOneMove() {
-    if (!super.atLeastOneMove()) {
-      // Search one reserve move
-      for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
-        let moves = this.filterValid(
-          this.getReserveMoves([V.size.x + (this.turn == "w" ? 0 : 1), i])
-        );
-        if (moves.length > 0) return true;
-      }
-      return false;
+    if (super.atLeastOneMove()) return true;
+    // Search one reserve move
+    for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
+      const moves = this.filterValid(
+        this.getReserveMoves([V.size.x + (this.turn == "w" ? 0 : 1), i])
+      );
+      if (moves.length > 0) return true;
     }
-    return true;
+    return false;
   }
 
   postPlay(move) {