peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Updated 'DetermineStartPlayerState' class.

Browse Source 
Updated the 'DetermineStartPlayerState' class by removing the 'rolls' attribute and its usage from it.
This commit is contained in:
Daniel Grigencha
2024-12-06 03:49:39 +01:00
parent 1a562a8d38
commit e3febd6ba1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/DetermineStartPlayerState.java
View File

@@ -11,10 +11,12 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.GameState; import pp.mdga.server.automaton.GameState;
import java.lang.System.Logger.Level;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger;
public class DetermineStartPlayerState extends GameAutomatonState { public class DetermineStartPlayerState extends GameAutomatonState {
/** /**
@@ -28,7 +30,6 @@ public class DetermineStartPlayerState extends GameAutomatonState {
private final Map<Integer, Integer> diceResults = new HashMap<>(); private final Map<Integer, Integer> diceResults = new HashMap<>();
private final List<Integer> playersHaveToRoll = new ArrayList<>(); private final List<Integer> playersHaveToRoll = new ArrayList<>();
private final Map<Integer, Boolean> messageReceived = new HashMap<>(); private final Map<Integer, Boolean> messageReceived = new HashMap<>();
private int rolls = 0;
/** /**
* Constructs a server state of the specified game logic. * Constructs a server state of the specified game logic.
@@ -64,7 +65,6 @@ public void received(RequestDieMessage msg, int from) {
int roll = this.logic.getGame().getDie().shuffle(); int roll = this.logic.getGame().getDie().shuffle();
this.logic.getServerSender().send(from, new DieMessage(roll)); this.logic.getServerSender().send(from, new DieMessage(roll));
this.diceResults.put(from, roll); this.diceResults.put(from, roll);
this.rolls++;
if (this.diceResults.size() == this.logic.getGame().getPlayers().size()) { if (this.diceResults.size() == this.logic.getGame().getPlayers().size()) {
int maximumRoll = 0; int maximumRoll = 0;
@@ -95,15 +95,15 @@ else if (maximumRoll < entry.getKey()) {
@Override @Override
public void received(AnimationEndMessage msg, int from) { public void received(AnimationEndMessage msg, int from) {
this.messageReceived.put(from, true); this.messageReceived.put(from, true);
if (this.messageReceived.size() == this.rolls) { if (this.messageReceived.size() == this.logic.getGame().getPlayers().size()) {
this.messageReceived.clear(); this.messageReceived.clear();
if (this.playersHaveToRoll.size() > 1) { if (this.playersHaveToRoll.size() > 1) {
for (Integer id : this.playersHaveToRoll) { for (Integer id : this.playersHaveToRoll) {
this.logic.getServerSender().send(id, new DiceNowMessage()); this.logic.getServerSender().send(id, new DiceNowMessage());
} }
this.rolls = 0;
} }
else { else {
LOGGER.log(Level.INFO, "Players have to roll: %s".formatted(this.logic.getGame().getPlayerById(this.playersHaveToRoll.get(0))));
Color color = this.logic.getGame().getPlayerById(this.playersHaveToRoll.get(0)).getColor(); Color color = this.logic.getGame().getPlayerById(this.playersHaveToRoll.get(0)).getColor();
this.logic.getGame().setActiveColor(color); this.logic.getGame().setActiveColor(color);
this.logic.getServerSender().broadcast(new RankingResponseMessage(this.diceResults)); this.logic.getServerSender().broadcast(new RankingResponseMessage(this.diceResults));