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

3
Projekte/mdga/model/src/main/java/pp/mdga/game/Color.java
View File

@@ -62,9 +62,10 @@ public Color next(Game game) {
int current = game.getActiveColor().ordinal();
int next = current + 1;
int next = (current + 1) % 4;
while (!colorsInGame.contains(Color.values()[next])) {
next++;
next %= 4;
}
return Color.values()[next];