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

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +4 -2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd2146d417 - Show all commits

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

@@ -14,8 +14,10 @@
import java.lang.System.Logger.Level; 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.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.logging.Logger; import java.util.logging.Logger;
public class DetermineStartPlayerState extends GameAutomatonState { public class DetermineStartPlayerState extends GameAutomatonState {
@@ -29,7 +31,7 @@ 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 Set<Integer> messageReceived = new HashSet<>();;
/** /**
* Constructs a server state of the specified game logic. * Constructs a server state of the specified game logic.
@@ -94,7 +96,7 @@ else if (maximumRoll < entry.getValue()) {
*/ */
@Override @Override
public void received(AnimationEndMessage msg, int from) { public void received(AnimationEndMessage msg, int from) {
this.messageReceived.put(from, true); this.messageReceived.add(from);
if (this.messageReceived.size() == this.logic.getGame().getPlayers().size()) { 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) {