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

2
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/NoTurnState.java
View File

@@ -25,7 +25,7 @@ public NoTurnState(ChoosePieceState choosePieceAutomaton, ServerGameLogic logic)
private void setActivePlayer(Color color) { private void setActivePlayer(Color color) {
if (!logic.getGame().getPlayerByColor(color.next(logic.getGame())).isFinished()) { if (!logic.getGame().getPlayerByColor(color.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(color.next(logic.getGame()))); logic.getServerSender().broadcast(new ActivePlayerMessage(logic.getGame().getActiveColor()));
} else { } else {
setActivePlayer(color.next(logic.getGame())); setActivePlayer(color.next(logic.getGame()));
} }