diff --git a/backend b/backend index 1f7ab4fc..4f167fa6 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 1f7ab4fc7bbcd906440254a17c3146df1cf6445f +Subproject commit 4f167fa6f5f1e5f597f34fd07d124a2596ea44fb diff --git a/src/main/kotlin/sc/gui/controller/GameController.kt b/src/main/kotlin/sc/gui/controller/GameController.kt index accbdde6..57b2b1dd 100644 --- a/src/main/kotlin/sc/gui/controller/GameController.kt +++ b/src/main/kotlin/sc/gui/controller/GameController.kt @@ -187,10 +187,10 @@ class GameController : Controller() { previousTurnColorProperty().set(turnColorProperty().get()) turnColorProperty().set(event.gameState.currentColor) } - undeployedRedPiecesProperty().set(event.gameState.undeployedPieceShapes[Color.RED]) - undeployedBluePiecesProperty().set(event.gameState.undeployedPieceShapes[Color.BLUE]) - undeployedGreenPiecesProperty().set(event.gameState.undeployedPieceShapes[Color.GREEN]) - undeployedYellowPiecesProperty().set(event.gameState.undeployedPieceShapes[Color.YELLOW]) + undeployedRedPiecesProperty().set(event.gameState.undeployedPieceShapes(Color.RED)) + undeployedBluePiecesProperty().set(event.gameState.undeployedPieceShapes(Color.BLUE)) + undeployedGreenPiecesProperty().set(event.gameState.undeployedPieceShapes(Color.GREEN)) + undeployedYellowPiecesProperty().set(event.gameState.undeployedPieceShapes(Color.YELLOW)) boardController.board.boardProperty().set(event.gameState.board) validRedPiecesProperty().set(ArrayList()) validBluePiecesProperty().set(ArrayList()) @@ -209,7 +209,7 @@ class GameController : Controller() { Color.BLUE -> validBluePiecesProperty() Color.GREEN -> validGreenPiecesProperty() Color.YELLOW -> validYellowPiecesProperty() - }.set(event.gameState.undeployedPieceShapes[event.gameState.currentColor]?.filter { + }.set(event.gameState.undeployedPieceShapes(event.gameState.currentColor).filter { isSelectable(it) } as ArrayList?) }