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

Fixed: disconnection during lobby creation--> currentStateProblem

Browse Source
This commit is contained in:
rubenpirreram
2026-05-14 14:04:22 +02:00
parent eb4eae4605
commit 6ff79f2e1d
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/ServerLauncher.java
+7 -3
View File
@@ -120,7 +120,7 @@ public class ServerLauncher {
Game game=gameController.getModel();
if(!event.getIsError())
{
if(event.getEventType().equals(EventType.DISCONNECTED_PLAYER)&& game.getCurrentState().equals(GameStages.WAITING))
if(event.getEventType().equals(EventType.DISCONNECTED_PLAYER)&& game.getCurrentState().getGameStage().equals(GameStages.WAITING))
{
playerList.remove(event.getUsername());
}else {
@@ -155,7 +155,6 @@ public class ServerLauncher {
else if(!this.gameSave() ){
System.out.println("\n!!! Save failed !!!\n");
}
}
if (event.getEventType().equals(EventType.DISCONNECTED_PLAYER) && playerList.values().stream().filter(x -> x).count() == 1) {
if (disconnectionTimer != null && !disconnectionTimer.isDone()) {
@@ -266,7 +265,12 @@ public class ServerLauncher {
while (true) {
try{
this.doFirstEvent();
this.view.fullRender();
try{
this.view.fullRender();
}
catch (NullPointerException e){
}
}
catch(InterruptedException e){
Thread.currentThread().interrupt();