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

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

@@ -60,16 +60,14 @@ public Color next(Game game) {
colorsInGame.add(p.getColor()); colorsInGame.add(p.getColor());
} }
int current = -1; int current = game.getActiveColor().ordinal();
for(int i = 0; i < colorsInGame.size(); i++) {
Color c = colorsInGame.get(i);
if(c.equals(game.getActiveColor())) { int next = current + 1;
current = i; while (!colorsInGame.contains(Color.values()[next])) {
} next++;
} }
return colorsInGame.get((current + 1) % colorsInGame.size()); return Color.values()[next];
} }
/** /**