From d0c8108fbc89b7dbaa394fb681a5032193905fa0 Mon Sep 17 00:00:00 2001
From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com>
Date: Sat, 28 Mar 2026 18:28:51 +0100
Subject: [PATCH] Fix: CurrentState Now Correctly Initialises 'round' Field

---
 .../polimi/ingsw/gc14/Model/GamePackage/CurrentState.java   | 2 +-
 .../ingsw/gc14/Model/GamePackage/CurrentStateTest.java      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java
index bc2dcce..47fef48 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentState.java
@@ -71,7 +71,7 @@ public class CurrentState {
         this.player = null;
         this.slot = null;
         this.Era = 1;
-        this.round = 0;
+        this.round = 1;
         this.NUpper = 0;
         this.NLower = 0;
         this.GameStage = GameStages.WAITING;
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentStateTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentStateTest.java
index 058e094..b07549a 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentStateTest.java
+++ b/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/CurrentStateTest.java
@@ -43,7 +43,7 @@ class CurrentStateTest {
         CurrentState curr = new CurrentState();
         curr.PlayerUpdate(p, s);
         curr.RoundUpdate();
-        assertEquals(1, curr.getRound());
+        assertEquals(2, curr.getRound());
     }
 
     @Test
@@ -94,7 +94,7 @@ class CurrentStateTest {
         CurrentState curr = new CurrentState();
         curr.PlayerUpdate(p, s);
         curr.RoundUpdate();
-        assertEquals(1, curr.getRound());
+        assertEquals(2, curr.getRound());
     }
 
     @Test
@@ -146,7 +146,7 @@ class CurrentStateTest {
         assertNull(curr.getCurrentPlayer());
         assertNull(curr.getSlot());
         assertEquals(1, curr.getEra());
-        assertEquals(0, curr.getRound());
+        assertEquals(1, curr.getRound());
         assertEquals(0, curr.getNUpper());
         assertEquals(0, curr.getNLower());
         assertEquals(GameStages.WAITING, curr.getGameStage());