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

3
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/rolldice/FirstRollState.java
View File

@@ -5,6 +5,7 @@
import pp.mdga.game.PieceState;
import pp.mdga.message.client.RequestDieMessage;
import pp.mdga.message.server.DiceAgainMessage;
import pp.mdga.message.server.DiceNowMessage;
import pp.mdga.message.server.DieMessage;
import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState;
@@ -65,7 +66,7 @@ public void received(RequestDieMessage msg, int from) {
this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new DieMessage(roll));
this.rollDiceAutomaton.getTurnAutomaton().setCurrentState(this.rollDiceAutomaton.getTurnAutomaton().getChoosePieceState());
} else {
this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new DiceAgainMessage());
this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new DiceNowMessage());
this.rollDiceAutomaton.setCurrentState(this.rollDiceAutomaton.getSecondRollState());
}
}