From 9894bb5f3d70ccbc92a6d9f0ff8c702251844fa0 Mon Sep 17 00:00:00 2001 From: rubenpirreram Date: Fri, 17 Apr 2026 17:17:13 +0200 Subject: [PATCH] Fix: Game Class and Test --- .../java/it/polimi/ingsw/gc14/Model/Game.java | 20 +++++++++++++++++-- .../polimi/ingsw/gc14/Network/EventType.java | 4 ++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/main/java/it/polimi/ingsw/gc14/Network/EventType.java diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java index d0d1112..4091090 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -60,7 +60,9 @@ public class Game { public int getNPlayers() { return nPlayers; } - public Game(int nPlayers) { + public Game(int nPlayers) throws IllegalArgumentException{ + if(nPlayers < 0||nPlayers > 5) + throw new IllegalArgumentException(); this.nPlayers = nPlayers; board=new Board(nPlayers); slotMap = new LinkedHashMap<>(); @@ -72,8 +74,16 @@ public class Game { playersList = new ArrayList<>(); OptionalCardQueue = new LinkedList<>(); } + public Game() + { + this(0); + } public boolean addPlayer(Player player) { + if(this.nPlayers==0) + { + return false; + } if(currentState.getGameStage()!= GameStages.WAITING) return false; if(playersList.contains(player)) @@ -415,7 +425,13 @@ public class Game { currentState.GameStageUpdate(GameStages.ENDED); } - + public boolean setNPlayer(int nPlayers) + { + if(this.nPlayers!=0) + return false; + this.nPlayers=nPlayers; + return true; + } diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java b/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java new file mode 100644 index 0000000..bcacffb --- /dev/null +++ b/src/main/java/it/polimi/ingsw/gc14/Network/EventType.java @@ -0,0 +1,4 @@ +package it.polimi.ingsw.gc14.Network; + +public enum EventType { +}