Merge remote-tracking branch 'origin/main'

src/main/java/it/polimi/ingsw/gc14/ErrorType.java

@@ -10,6 +10,8 @@ public enum ErrorType {
     WRONG_PLAYER_NUMBER("Wrong player number"),
     /** The server has crashed or become unreachable. */
     SERVER_CRASHED("Server crashed"),
+    /** The server is unreachable. */
+    SERVER_UNREACHABLE("Server unreachable"),
     /** A generic, unclassified error occurred. */
     GENERIC_ERROR("Generic error"),
     /** The game has already started and cannot accept new players. */

src/main/java/it/polimi/ingsw/gc14/GameEventProcessor.java

@@ -208,6 +208,9 @@ public class GameEventProcessor {
             if (!saveManager.save(game)) {
                 System.out.println("\n!!! Save failed !!!\n");
             }
+            else {
+                System.out.println(event.getUsername()+": "+ event.getEventType() + " save successful.");
+            }
 
             // During the lobby phase a disconnection only removes the player
             // from the list; no broadcast is needed.
@@ -268,12 +271,14 @@ public class GameEventProcessor {
 
         if (disconnectionTimer != null && !disconnectionTimer.isDone()) {
             disconnectionTimer.cancel(false);
+            System.out.println("Disconnection TIMER reset");
         }
 
         disconnectionTimer = timerExecutor.schedule(
                 () -> endGameForfeit(game),
                 1, TimeUnit.MINUTES
         );
+        System.out.println("Disconnection TIMER started, 60 seconds from now..." );
     }
 
     /**

src/main/java/it/polimi/ingsw/gc14/Model/Game.java

@@ -162,6 +162,7 @@ public class Game implements Serializable {
                 nextPlayerSetup();
             }
             else {
+                totemChoiceQueue.removeIf(x->x.getUserName().equals(player.getUserName()));
                 if (totemChoiceQueue.isEmpty()) {
                     player.setTotem(getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size())));
                 } else {
@@ -207,6 +208,11 @@ public class Game implements Serializable {
                 disconnectedPlayers.remove(player);
             }
         }
+        else if(currentState.getGameStage() == GameStages.TOTEM_CHOICE)
+        {
+            totemChoiceQueue.removeIf(x->x.getUserName().equals(player.getUserName()));
+            totemChoiceQueue.add(player);
+        }
         return true;
     }
 

src/main/java/it/polimi/ingsw/gc14/Network/RMI/Client/RMIClient.java

@@ -70,7 +70,7 @@ public class RMIClient  implements IClient {
             return status;
         } catch (Exception e) {
             e.printStackTrace();
-            return ErrorType.GENERIC_ERROR;
+            return ErrorType.SERVER_UNREACHABLE;
         }
     }
 

src/main/java/it/polimi/ingsw/gc14/Network/RMI/Server/RMIHeartbeat.java

@@ -98,6 +98,6 @@ public class RMIHeartbeat {
 
         clients.remove(username);
         actionQueue.add(new DisconnectedPlayer(username));
-        System.out.println("RMI disconnected: " + username);
+        System.err.println("(RMI) Disconnected player: " + username);
     }
 }

src/main/java/it/polimi/ingsw/gc14/Network/RMI/Server/RMIServer.java

@@ -96,7 +96,7 @@ public class RMIServer extends UnicastRemoteObject implements IGameServer {
             if (playerList.isEmpty() &&(controller.getModel()==null || controller.getModel().getCurrentState().getGameStage().equals(GameStages.WAITING))) {
                 controller.setModel(new Game(preferredInt));
                 playerList.setLimit(preferredInt);
-                System.out.println("Game Created With :"+preferredInt+" Players");
+                System.out.println("Game Created With: "+preferredInt+" Players");
             }
             if(controller.getModel().getCurrentState().getGameStage()!= GameStages.WAITING ) {
                 if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))|| controller.getModel().getCurrentState().getGameStage()==GameStages.ENDED) {
@@ -107,8 +107,9 @@ public class RMIServer extends UnicastRemoteObject implements IGameServer {
                 if (controller.addPlayer(username)) {
                     clients.put(username, callback);
                     playerList.put(username, true);
-                    startWatchdog(username);
                     System.out.println("Accepted player: " + username);
+                    startWatchdog(username);
+                    System.out.println("Heartbeat connected for: " + username);
                     return null;
                 } else {
                     return ErrorType.USERNAME_ALREADY_USED;
@@ -119,8 +120,9 @@ public class RMIServer extends UnicastRemoteObject implements IGameServer {
             if(!playerList.containsKey(username)){
                 clients.put(username, callback);
                 playerList.put(username, true);
-                startWatchdog(username);
                 System.out.println("(After crash)Reconnected player: " + username);
+                startWatchdog(username);
+                System.out.println("Heartbeat connected for: " + username);
                 return null;
             }
             else {
@@ -130,6 +132,7 @@ public class RMIServer extends UnicastRemoteObject implements IGameServer {
                     clients.put(username, callback);
                     System.out.println("Reconnected player: " + username);
                     startWatchdog(username);
+                    System.out.println("Heartbeat connected for: " + username);
                     Game game = controller.getModel();
                     callback.onGameInit(new MiniModel(
                             game.getSlotMap(), game.getOrderLogicCard(), game.getCurrentState(),

src/main/java/it/polimi/ingsw/gc14/Network/TCP/Client/TCPClient.java

@@ -105,7 +105,7 @@ public class TCPClient implements IClient {
 
         } catch (IOException e) {
             e.printStackTrace();
-            return ErrorType.GENERIC_ERROR;
+            return ErrorType.SERVER_UNREACHABLE;
         }
     }
 

src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/ClientHandler.java

@@ -91,7 +91,6 @@ public class ClientHandler implements Runnable {
                 }
             }
         } catch (IOException e) {
-            System.err.println("Error in incoming connection/disconnection: " + username);
         } catch (ClassNotFoundException e) {
             System.err.println("Class not found: " + username);
         } finally {
@@ -144,7 +143,7 @@ public class ClientHandler implements Runnable {
         clientHandlers.remove(this);
         limitedMap.put(username, false);
         actionQueue.add(new DisconnectedPlayer(username));
-        System.out.println("Disconnected player: " + username);
+        System.err.println("(TCP) Disconnected player: " + username);
         try { clientSocket.close(); } catch (IOException ignored) {}
     }
 }

src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/HeartbeatHandler.java

@@ -124,8 +124,7 @@ public class HeartbeatHandler implements Runnable {
     private synchronized void disconnect() {
         running = false;
         watchdog.shutdownNow();
-        mainHandler.disconnect(); // disconnette anche il socket principale
-        System.out.println("Disconnected: " + username);
+        mainHandler.disconnect();
         try { socket.close(); } catch (IOException ignored) {}
     }
 }

src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java

@@ -164,7 +164,7 @@ public class TCPServer {
                         Game model = new Game(eventAddPlayer.getProposedNPlayer());
                         controller.setModel(model);
                         playerList.setLimit(eventAddPlayer.getProposedNPlayer());
-                        System.out.println("Game Created With :"+eventAddPlayer.getProposedNPlayer()+" Players");
+                        System.out.println("Game Created With: "+eventAddPlayer.getProposedNPlayer()+" Players");
                     }
                     if(controller.getModel().getCurrentState().getGameStage()!= GameStages.WAITING ) {
                         if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))|| controller.getModel().getCurrentState().getGameStage()==GameStages.ENDED) {

src/main/java/it/polimi/ingsw/gc14/SaveManager.java

@@ -65,7 +65,6 @@ public class SaveManager {
             try (ObjectOutputStream oos = new ObjectOutputStream(
                     new BufferedOutputStream(new FileOutputStream(filePath.toFile())))) {
                 oos.writeObject(game);
-                System.out.println("Game saved to: " + filePath.toAbsolutePath());
                 return true;
             }
         } catch (IOException e) {