deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

indexWhere should return Option[Int], this -1 business is ridiculous 

for #9304
pull/9317/head
Thibault Duplessis 2021-06-29 21:00:41 +02:00
parent 67fc4ff44f
commit fe188d74b0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/game/src/main/BSONHandlers.scala
View File

@ -104,7 +104,10 @@ object BSONHandlers {
val clm = r.get[CastleLastMove](F.castleLastMove)
val pgnMoves = PgnStorage.OldBin.decode(r bytesD F.oldPgn, playedPlies)
val halfMoveClock =
pgnMoves.reverse.indexWhere(san => san.contains("x") || san.headOption.exists(_.isLower))
pgnMoves.reverse
.indexWhere(san => san.contains("x") || san.headOption.exists(_.isLower))
.some
.filter(0 <=)
PgnStorage.Decoded(
pgnMoves = pgnMoves,
pieces = BinaryFormat.piece.read(r bytes F.binaryPieces, gameVariant),
@ -112,9 +115,8 @@ object BSONHandlers {
unmovedRooks = r.getO[UnmovedRooks](F.unmovedRooks) | UnmovedRooks.default,
lastMove = clm.lastMove,
castles = clm.castles,
halfMoveClock =
(if (halfMoveClock < 0) r.getO[FEN](F.initialFen).flatMap(_.halfMove) | playedPlies
else halfMoveClock)
halfMoveClock = halfMoveClock orElse
r.getO[FEN](F.initialFen).flatMap(_.halfMove) getOrElse playedPlies
)
}
val chessGame = ChessGame(