From 1107542c5485bbff23e6855ef7cef0be05f2d964 Mon Sep 17 00:00:00 2001 From: Julian Kropff Date: Sun, 26 Apr 2026 18:09:03 +0200 Subject: [PATCH] Fix: Bug fix so that the 3000 cap does not apply to every Phase --- .../gameuicomponents/TaskbarController.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java index f393cb1..1881836 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java @@ -412,7 +412,7 @@ public class TaskbarController { boolean phaseChanged) { // boolean firstPlayerNewRound = - // phaseChanged && isFirstPreflopPlayerInputOnly(state, me); + // phaseChanged && isFirstPreflopPlayer(state, me); inputActionAllowed = false; if (!isMyTurn || isOutOrFinished || state == null || me == null) { setBetButtonVisible(false); @@ -433,20 +433,20 @@ public class TaskbarController { return; } - // if (isFirstPreflopPlayerInputOnly(state, me)) { - // setActionEnabled(betButton, true); - // setActionEnabled(callButton, false); - // setActionEnabled(foldButton, false); - // setActionEnabled(raiseButton, false); - // activateInputField(taskbarInput); - // inputActionAllowed = true; - // return; - // } + if (isFirstPreflopPlayer(state, me)) { + setActionEnabled(betButton, true); + setActionEnabled(callButton, false); + setActionEnabled(foldButton, false); + setActionEnabled(raiseButton, false); + activateInputField(taskbarInput); + inputActionAllowed = true; + return; + } if (isFirstPlayerOfPhase(state, me)) { setActionEnabled(betButton, true); setActionEnabled(callButton, false); - setActionEnabled(foldButton, false); + // setActionEnabled(foldButton, false); setActionEnabled(raiseButton, false); activateInputField(taskbarInput); inputActionAllowed = true; @@ -605,7 +605,7 @@ public class TaskbarController { * @return A boolean value indicating whether the current player is the first to act in the * pre-flop phase with only the initial blind layout in place. */ - private boolean isFirstPreflopPlayerInputOnly(GameState state, Player me) { + private boolean isFirstPreflopPlayer(GameState state, Player me) { if (state == null || me == null || !isPreflop(state.phase) || state.players == null) { return false; } @@ -1078,7 +1078,7 @@ public class TaskbarController { return ValidationResult.blocked("Bet must match at least the call amount"); } - if (isFirstPlayerOfPhase(state, me)) { + if (isFirstPreflopPlayer(state, me)) { if (required > FIRST_PLAYER_MAX_BET) { return ValidationResult.blocked( "First player cannot bet more than " + FIRST_PLAYER_MAX_BET);