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

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(activePlayer.next(logic.getGame())); setActivePlayer(logic.getGame().getActiveColor());
} }
} }

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

@@ -93,7 +93,7 @@ private boolean canHomeMove(Piece piece, int moveIndex){
protected int calculateTargetIndex(Piece piece){ protected int calculateTargetIndex(Piece piece){
int steps = logic.getGame().getDiceModifier() * logic.getGame().getDiceEyes(); int steps = logic.getGame().getDiceModifier() * logic.getGame().getDiceEyes();
return (logic.getGame().getBoard().getInfieldIndexOfPiece(piece) + steps) % logic.getGame().getBoard().getInfield().length; return (logic.getGame().getBoard().getInfieldIndexOfPiece(piece) + steps) % logic.getGame().getBoard().getInfield().length;
} }
} }