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

2
Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
View File

@@ -85,7 +85,7 @@ public Game() {
gameStatistics = new Statistic(); gameStatistics = new Statistic();
initializeDrawPile(); initializeDrawPile();
board = new Board(); board = new Board();
die = new Die(); die = new Die(2,1,6,2,1,3);
} }
/** /**

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

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