Merge pull request #103 from rubenpirreram/game-ending

Game ending

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

@@ -31,7 +31,7 @@ public class Game implements Serializable {
 
 
     private ArrayList<Player> playerStanding;
-    public List<Player> getPlayerStanding() {
+    public ArrayList<Player> getPlayerStanding() {
         return playerStanding;
     }
     /**
@@ -992,12 +992,13 @@ public class Game implements Serializable {
         return true;
     }
 
-    public void EndGameForFeit(Player winner) {
+    public void EndGameForFeit() {
+        Player winner=playersList.stream().filter(x->!disconnetedPlayers.containsValue(x)||!disconnetedPlayers.get(x)).toList().get(0);
         currentState.GameStageUpdate(GameStages.ENDED);
         playerStanding=new ArrayList<>(playersList);
         playerStanding.remove(winner);
         playerStanding.sort((y,x)->x.getPrestigeValue()==y.getPrestigeValue()?Integer.compare(x.getFoodValue(),y.getFoodValue()):Integer.compare(x.getPrestigeValue(),y.getPrestigeValue()));
-        playerStanding.addFirst(winner);
+        playerStanding.add(0,winner);
     }
 
 

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

@@ -74,7 +74,7 @@ public class MiniModel implements Serializable {
     public void setPlayer(Player player) {
         players.put(player.getUserName(), player);
     }
-    public void setStandingPlayers(List<Player> standingPlayers) {
+    public void setStandingPlayers(ArrayList<Player> standingPlayers) {
         this.standingPlayers = standingPlayers;
     }
 

src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DrawUpperBuildingCard.java

@@ -42,7 +42,7 @@ public class DrawUpperBuildingCard extends NetworkEvent implements  Serializable
         if(isError)
             return false;
 
-        miniModel.board.removeUpperTribeCard(miniModel.board.upperListTribe.get(pos));
+        miniModel.board.removeUpperBuildingCard(miniModel.board.upperListBuilding.get(pos));
         miniModel.setPlayer(player);
         miniModel.setOrderLogicCard(orderLogicCard);
         miniModel.setCurrentState(currentState);

src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/EndedGame.java

@@ -11,6 +11,7 @@ import it.polimi.ingsw.gc14.Network.NetworkEvent;
 import it.polimi.ingsw.gc14.View.IView;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -19,9 +20,9 @@ import java.util.Map;
  */
 public class EndedGame extends NetworkEvent implements  Serializable{
 
-    List<Player> players;
+    ArrayList<Player> players;
     //TODO
-    public EndedGame(Map<Slot, Player> slotPlayerMap, OrderLogicCard orderLogicCard, CurrentState currentState, List<Player> players){
+    public EndedGame(Map<Slot, Player> slotPlayerMap, OrderLogicCard orderLogicCard, CurrentState currentState, ArrayList<Player> players){
         super("SERVER",EventType.ENDED_GAME,false);
         this.slotPlayerMap = slotPlayerMap;
         this.orderLogicCard = orderLogicCard;

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

@@ -164,10 +164,13 @@ public class ServerLauncher {
                         disconnectionTimer.cancel(false);
                     }
                     disconnectionTimer = timerExecutor.schedule(() -> {
-                        game.EndGameForFeit(game.getPlayerByUsername(playerList.keySet().stream().toList().getFirst()));
+                        game.EndGameForFeit();
                         serverRMI.notifyAll(new EndedGame(game.getSlotMap(), game.orderLogicCard, game.getCurrentState(),game.getPlayerStanding()));
                         serverTCP.notifyAll(new EndedGame(game.getSlotMap(), game.orderLogicCard, game.getCurrentState(),game.getPlayerStanding()));
                         System.out.println("Timer expired: no player reconnected in 60s.");
+                        if(!this.deleteSave()){
+                            System.out.println("\n!!! Couldn't delete save !!!\n");
+                        }
                     }, 1, TimeUnit.MINUTES);
                 }
                 return !event.getIsError();