Projekte/mdga/model/src/main/java/pp/mdga/game/Color.java

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