Merge branch 'main' into GUI-2.0

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

@@ -96,20 +96,26 @@ public class Game implements Serializable {
             return false;
         }
         disconnetedPlayers.put(player,true);
-        if(currentState.getCurrentPlayer().equals(player))
-            if(!currentState.getGameStage().equals(GameStages.TOTEM_CHOICE))
+        if (currentState.getGameStage().equals(GameStages.WAITING)) {
+            playersList.remove(player);
+            totemChoiceQueue.remove(player);
+            return true;
+        }
+        if(currentState.getCurrentPlayer().equals(player)) {
+            if (!currentState.getGameStage().equals(GameStages.TOTEM_CHOICE)) {
                 nextPlayerSetup();
-            else
-            {
-                if(totemChoiceQueue.isEmpty())
-                {
-                    player.totem=getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size()-1));
-                }
-                else {
+                return true;
+            }
+            else {
+                if (totemChoiceQueue.isEmpty()) {
+                    player.totem = getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size() - 1));
+                } else {
                     totemChoiceQueue.add(player);
                 }
-                currentState.PlayerUpdate(totemChoiceQueue.poll(),null);
+                currentState.PlayerUpdate(totemChoiceQueue.poll(), null);
+                return true;
             }
+        }
 
         return true;
     }

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

@@ -70,6 +70,11 @@ public abstract class OrderLogicCard implements Serializable {
             playerList=new ArrayList<>();
 
         }
+        if(players.stream().anyMatch(x->x.getUserName().equals(player.getUserName())))
+        {
+            return;
+        }
+        playerList.removeIf(x->player.getUserName().equals(x.player.getUserName()));
         playerList.add(new OrderPlayer(player,false));
         players.add(player);
     }