Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Totem error show

Browse Source
This commit is contained in:
aleandro
2026-06-19 19:39:32 +02:00
parent 80c8236e07
commit 641b8c0a4d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/ClientLauncherTUI.java
+4 -4
View File
@@ -196,7 +196,7 @@ public class ClientLauncherTUI {
client = new RMIClient(controller, ip, NetworkConfig.RMI_PORT, myIP); client = new RMIClient(controller, ip, NetworkConfig.RMI_PORT, myIP);
ErrorType err = client.connect(username, nPlayers); ErrorType err = client.connect(username, nPlayers);
if (err != null) { if (err != null) {
loginReader.printAbove("\033[31mErrore: " + err + "\033[0m"); loginReader.printAbove("\033[31mError: " + err + "\033[0m");
return false; return false;
} }
System.out.println("Connected via RMI, waiting for other players..."); 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); client = new TCPClient(controller, ip, NetworkConfig.TCP_PORT, NetworkConfig.HEARTBEAT_PORT);
ErrorType err = client.connect(username, nPlayers); ErrorType err = client.connect(username, nPlayers);
if (err != null) { if (err != null) {
loginReader.printAbove("\033[31mErrore: " + err + "\033[0m"); loginReader.printAbove("\033[31mError: " + err + "\033[0m");
return false; return false;
} }
System.out.println("Connected via TCP, waiting for other players..."); System.out.println("Connected via TCP, waiting for other players...");
@@ -264,12 +264,12 @@ public class ClientLauncherTUI {
switch (cmd) { switch (cmd) {
case "slot" -> { case "slot" -> {
int pos = parsePos(parts, 1); int pos = parsePos(parts, 1);
if (pos >= 0) controller.slotChoice(pos); controller.slotChoice(pos);
} }
case "draw" -> handleDraw(parts, controller); case "draw" -> handleDraw(parts, controller);
case "totem" -> { case "totem" -> {
int pos = parsePos(parts, 1); int pos = parsePos(parts, 1);
if (pos >= 0) controller.totemChoice(pos); controller.totemChoice(pos);
} }
case "skip" -> controller.skipTurn(); case "skip" -> controller.skipTurn();
case "clear" -> handleRender(); case "clear" -> handleRender();
src/main/java/it/polimi/ingsw/gc14/Controller/ClientController.java
+4 -1
View File
@@ -1,5 +1,6 @@
package it.polimi.ingsw.gc14.Controller; package it.polimi.ingsw.gc14.Controller;
import it.polimi.ingsw.gc14.ErrorType;
import it.polimi.ingsw.gc14.Model.MiniModel; import it.polimi.ingsw.gc14.Model.MiniModel;
import it.polimi.ingsw.gc14.Network.IClient; import it.polimi.ingsw.gc14.Network.IClient;
import it.polimi.ingsw.gc14.View.IView; import it.polimi.ingsw.gc14.View.IView;
@@ -182,8 +183,10 @@ public class ClientController {
*/ */
public void totemChoice(int pos) { public void totemChoice(int pos) {
if (miniModel == null || miniModel.availableTotems == null 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; return;
}
client.totemChoice(myUsername, String.valueOf(miniModel.availableTotems.get(pos))); client.totemChoice(myUsername, String.valueOf(miniModel.availableTotems.get(pos)));
} }