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

Fixed:Order Card

Browse Source
This commit is contained in:
rubenpirreram
2026-05-17 17:38:48 +02:00
parent 82653b098e
commit bd2d70e0a9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/Game.java
+6 -4
View File
@@ -746,7 +746,7 @@ public class Game implements Serializable {
currentState.GameStageUpdate(GameStages.OPT_CARD_E); currentState.GameStageUpdate(GameStages.OPT_CARD_E);
OptionalCardQueue = new LinkedList<>(); OptionalCardQueue = new LinkedList<>();
for (Player p : orderLogicCard.players) { for (Player p :playersList) {
long count = p.buildingCards.stream().filter(x -> x.getEffectId() == 12).count(); long count = p.buildingCards.stream().filter(x -> x.getEffectId() == 12).count();
if (count > 0) { if (count > 0) {
OptionalCardQueue.add(p); OptionalCardQueue.add(p);
@@ -760,9 +760,6 @@ public class Game implements Serializable {
return; return;
} }
// Nobody has optional cards → go straight to event resolution
currentState.GameStageUpdate(GameStages.RES_EVENT);
if (currentState.getRound() < 10) { if (currentState.getRound() < 10) {
nextRound(); nextRound();
for(Map.Entry<Player,Boolean> entry: disconnetedPlayers.entrySet()) for(Map.Entry<Player,Boolean> entry: disconnetedPlayers.entrySet())
@@ -772,6 +769,11 @@ public class Game implements Serializable {
orderLogicCard.pushNoEffect(entry.getKey()); orderLogicCard.pushNoEffect(entry.getKey());
disconnetedPlayers.remove(entry.getKey()); disconnetedPlayers.remove(entry.getKey());
} }
else
{
orderLogicCard.players.removeIf(x->x.equals(entry.getKey()));
orderLogicCard.playerList.removeIf(x->x.player.equals(entry.getKey()));
}
} }
currentState.PlayerUpdate(orderLogicCard.pull(), null); currentState.PlayerUpdate(orderLogicCard.pull(), null);
currentState.GameStageUpdate(GameStages.SLOT_CHOICE); currentState.GameStageUpdate(GameStages.SLOT_CHOICE);