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

Fixed: endgame reconnection updated

Browse Source
This commit is contained in:
rubenpirreram
2026-06-14 16:09:49 +02:00
parent c751d7d9ff
commit a35c95c1c0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Network/RMI/Server/RMIServer.java
+1 -1
View File
@@ -101,7 +101,7 @@ public class RMIServer extends UnicastRemoteObject implements IGameServer {
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().getCurrentState().getGameStage()!= GameStages.WAITING ) {
if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))) { if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))|| controller.getModel().getCurrentState().getGameStage()==GameStages.ENDED) {
return ErrorType.GAME_ALREADY_STARTED; return ErrorType.GAME_ALREADY_STARTED;
} }
} }
src/main/java/it/polimi/ingsw/gc14/Network/TCP/Server/TCPServer.java
+1 -1
View File
@@ -167,7 +167,7 @@ public class TCPServer {
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().getCurrentState().getGameStage()!= GameStages.WAITING ) {
if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))) { if (controller.getModel().getPlayers().stream().noneMatch(p -> p.getUserName().equals(username))|| controller.getModel().getCurrentState().getGameStage()==GameStages.ENDED) {
eventAddPlayer.setErrorType(ErrorType.GAME_ALREADY_STARTED); eventAddPlayer.setErrorType(ErrorType.GAME_ALREADY_STARTED);
eventAddPlayer.setIsError(true); eventAddPlayer.setIsError(true);
clientSend.writeObject(eventAddPlayer); clientSend.writeObject(eventAddPlayer);