Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
davi-bart committed Feb 15, 2024
2 parents 0335006 + d302601 commit 007e534
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/main/java/it/unibo/view/CurrentPlayerView.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ public void draw() {
if (!controller.canRollDie()) {
super.getChildren().add(rolledValue);
}
if (controller.mustPlaceRobber()) {
robberView.evokeRobber();
}
}

/**
Expand Down Expand Up @@ -80,6 +77,9 @@ private Button getRollButton() {
+ roll.getRight() + ")");
rollButton.setText(String.valueOf(roll.getLeft() + roll.getRight()));
draw();
if (controller.mustPlaceRobber()) {
robberView.evokeRobber();
}
}
});
rollButton.setDisable(!controller.canRollDie());
Expand Down
1 change: 0 additions & 1 deletion src/main/java/it/unibo/view/TradeView.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ private void showTradeStage() {
enable = false;
}
tradeBank.setDisable(!enable);

};

Stream.of(ResourceType.values()).forEach(resource -> {
Expand Down

0 comments on commit 007e534

Please sign in to comment.