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 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23ae4a3080 - Show all commits

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

@@ -69,10 +69,10 @@ public void received(RequestDieMessage msg, int from) {
int maximumRoll = 0; int maximumRoll = 0;
for (Map.Entry<Integer, Integer> entry : this.diceResults.entrySet()) { for (Map.Entry<Integer, Integer> entry : this.diceResults.entrySet()) {
if (maximumRoll == entry.getKey()) { if (maximumRoll == entry.getValue()) {
this.playersHaveToRoll.add(entry.getKey()); this.playersHaveToRoll.add(entry.getKey());
} }
else if (maximumRoll < entry.getKey()) { else if (maximumRoll < entry.getValue()) {
maximumRoll = entry.getValue(); maximumRoll = entry.getValue();
this.playersHaveToRoll.clear(); this.playersHaveToRoll.clear();
this.playersHaveToRoll.add(entry.getKey()); this.playersHaveToRoll.add(entry.getKey());