chore: resolved a huge merge conflict

2025-11-13 08:56:03 +01:00
parent 5c8fd8510e 5d245d0011
commit eb0a1beeef
10 changed files with 412 additions and 296 deletions
--- a/knockoutwhistweb/app/logic/game/GameLobby.scala
+++ b/knockoutwhistweb/app/logic/game/GameLobby.scala
@@ -188,6 +188,9 @@ class GameLobby private(
   */
  def selectTie(userSession: UserSession, tieNumber: Int): Unit = {
    val player = getPlayerInteractable(userSession, InteractionType.TieChoice)
+    val highestNumber = logic.playerTieLogic.highestAllowedNumber()
+    if (tieNumber < 0 || tieNumber > highestNumber)
+      throw new IllegalArgumentException(s"Selected number $tieNumber is out of allowed range (0 to $highestNumber)")
    userSession.resetCanInteract()
    logic.playerTieLogic.receivedTieBreakerCard(tieNumber)
  }