Fixed: Standing Order When Forfeit (MiniModel & Network)
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user