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

Totem FIx?

Browse Source
This commit is contained in:
rubenpirreram
2026-06-19 20:39:52 +02:00
parent f8e6921368
commit 7f582f116b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/Game.java
+5 -3
View File
@@ -109,7 +109,7 @@ public class Game implements Serializable {
if(nextPlayer==null) if(nextPlayer==null)
{ {
currentState.gameStageUpdate(GameStages.SLOT_CHOICE); currentState.gameStageUpdate(GameStages.SLOT_CHOICE);
currentState.playerUpdate(orderLogicCard.pull(),null); nextPlayerSetup();
return true; return true;
} }
} }
@@ -163,10 +163,12 @@ public class Game implements Serializable {
} }
else { else {
totemChoiceQueue.removeIf(x->x.getUserName().equals(player.getUserName())); totemChoiceQueue.removeIf(x->x.getUserName().equals(player.getUserName()));
player.setTotem(getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size())));
if (totemChoiceQueue.isEmpty()) { if (totemChoiceQueue.isEmpty()) {
player.setTotem(getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size()))); player.setTotem(getAvailableTotems().get(new Random().nextInt(getAvailableTotems().size())));
} else { currentState.gameStageUpdate(GameStages.SLOT_CHOICE);
totemChoiceQueue.add(player); nextPlayerSetup();
return true;
} }
currentState.playerUpdate(totemChoiceQueue.poll(), null); currentState.playerUpdate(totemChoiceQueue.poll(), null);
} }