Fix #869 (movenum of the first move)

featurecat · Feb 9, 2021 · 1e6ba97 · 1e6ba97
1 parent 15f9462
commit 1e6ba97
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/featurecat/lizzie/rules/Board.java b/src/main/java/featurecat/lizzie/rules/Board.java
@@ -517,9 +517,11 @@ public void place(int x, int y, Stone color, boolean newBranch, boolean changeMo
       Stone[] stones = history.getStones().clone();
       Zobrist zobrist = history.getZobrist();
       Optional<int[]> lastMove = Optional.of(new int[] {x, y});
+      boolean isNewSubBranch = newBranch && !history.getData().firstBranch;
+      boolean isMissingMoveMNNumber = history.getMoveMNNumber() < 0;
       int moveNumber = history.getMoveNumber() + 1;
       int moveMNNumber =
-          !newBranch || history.getData().firstBranch ? history.getMoveMNNumber() + 1 : 1;
+          isNewSubBranch ? 1 : isMissingMoveMNNumber ? -1 : history.getMoveMNNumber() + 1;
       int[] moveNumberList =
           newBranch && history.getNext(true).isPresent()
               ? new int[Board.boardWidth * Board.boardHeight]