From c85d73f66c23097848cf1b8f16067f1689141c3f Mon Sep 17 00:00:00 2001 From: Beenie93 Date: Sat, 4 Sep 2021 04:31:17 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=8B=A4=EC=88=98=EC=9D=98=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EB=A9=94=EC=86=8C=EB=93=9C=20=ED=95=98?= =?UTF-8?q?=EB=82=98=EB=A1=9C=20=EC=B6=94=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/chess/domain/board/Board.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/chess/domain/board/Board.java b/src/main/java/chess/domain/board/Board.java index 77db463..3193062 100644 --- a/src/main/java/chess/domain/board/Board.java +++ b/src/main/java/chess/domain/board/Board.java @@ -23,13 +23,17 @@ public void move(final MoveOptions moveOptions, final boolean isWhiteTurn) { Position source = moveOptions.getSource(); Position target = moveOptions.getTarget(); + validate(player, enemy, source, target); + + enemy.removePieceOn(target); + movePiece(player, source, target); + } + + private void validate(final Player player, final Player enemy, final Position source, final Position target) { validateSourceOwner(enemy, source); validateSamePosition(source, target); validateTarget(player, target); validateKingMovable(player, enemy, source, target); - - enemy.removePieceOn(target); - movePiece(player, source, target); } private Player currentPlayer(final boolean isWhiteTurn) {