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

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

@@ -54,6 +54,9 @@ public Color next(Game game) {
ArrayList<Color> colorsInGame = new ArrayList<>(); ArrayList<Color> colorsInGame = new ArrayList<>();
for(Player p : game.getPlayers().values()) { for(Player p : game.getPlayers().values()) {
if(p.isFinished()) {
continue;
}
colorsInGame.add(p.getColor()); colorsInGame.add(p.getColor());
} }

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

@@ -36,11 +36,11 @@ public void enter() {
} }
private void setActivePlayer(Color activePlayer) { private void setActivePlayer(Color activePlayer) {
if (logic.getGame().getPlayerByColor(activePlayer.next(logic.getGame())).isFinished()) { if (!logic.getGame().getPlayerByColor(activePlayer.next(logic.getGame())).isFinished()) {
logic.getGame().setActiveColor(logic.getGame().getActiveColor().next(logic.getGame())); logic.getGame().setActiveColor(logic.getGame().getActiveColor().next(logic.getGame()));
logic.getServerSender().broadcast(new ActivePlayerMessage(activePlayer.next(logic.getGame()))); logic.getServerSender().broadcast(new ActivePlayerMessage(activePlayer.next(logic.getGame())));
} else { } else {
setActivePlayer(logic.getGame().getActiveColor()); throw new RuntimeException("handle player finished is not yet implemented"); //TODO
} }
} }