From 641b8c0a4dfb81651172b7231cf2a69f981ccdf8 Mon Sep 17 00:00:00 2001 From: aleandro Date: Fri, 19 Jun 2026 19:39:32 +0200 Subject: [PATCH] Totem error show --- src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java | 8 ++++---- .../it/polimi/ingsw/gc14/Controller/ClientController.java | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java index 1c3988a..c9ef8fe 100644 --- a/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java @@ -196,7 +196,7 @@ public class ClientLauncherTUI { client = new RMIClient(controller, ip, NetworkConfig.RMI_PORT, myIP); ErrorType err = client.connect(username, nPlayers); if (err != null) { - loginReader.printAbove("\033[31mErrore: " + err + "\033[0m"); + loginReader.printAbove("\033[31mError: " + err + "\033[0m"); return false; } System.out.println("Connected via RMI, waiting for other players..."); @@ -206,7 +206,7 @@ public class ClientLauncherTUI { client = new TCPClient(controller, ip, NetworkConfig.TCP_PORT, NetworkConfig.HEARTBEAT_PORT); ErrorType err = client.connect(username, nPlayers); if (err != null) { - loginReader.printAbove("\033[31mErrore: " + err + "\033[0m"); + loginReader.printAbove("\033[31mError: " + err + "\033[0m"); return false; } System.out.println("Connected via TCP, waiting for other players..."); @@ -264,12 +264,12 @@ public class ClientLauncherTUI { switch (cmd) { case "slot" -> { int pos = parsePos(parts, 1); - if (pos >= 0) controller.slotChoice(pos); + controller.slotChoice(pos); } case "draw" -> handleDraw(parts, controller); case "totem" -> { int pos = parsePos(parts, 1); - if (pos >= 0) controller.totemChoice(pos); + controller.totemChoice(pos); } case "skip" -> controller.skipTurn(); case "clear" -> handleRender(); diff --git a/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java b/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java index b5faf01..22ad64e 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java +++ b/src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java @@ -1,5 +1,6 @@ package it.polimi.ingsw.gc14.Controller; +import it.polimi.ingsw.gc14.ErrorType; import it.polimi.ingsw.gc14.Model.MiniModel; import it.polimi.ingsw.gc14.Network.IClient; import it.polimi.ingsw.gc14.View.IView; @@ -182,8 +183,10 @@ public class ClientController { */ public void totemChoice(int pos) { if (miniModel == null || miniModel.availableTotems == null - || pos < 0 || pos >= miniModel.availableTotems.size()) + || pos < 0 || pos >= miniModel.availableTotems.size()) { + view.showError(ErrorType.WRONG_ACTION, "ERROR: Invalid Totem Choice"); return; + } client.totemChoice(myUsername, String.valueOf(miniModel.availableTotems.get(pos))); }