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

1
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/AnimationState.java
View File

@@ -55,7 +55,6 @@ public void exit() {
public void received(AnimationEndMessage msg, int from) {
this.messageReceived.put(from, true);
if (this.messageReceived.size() == this.logic.getGame().getPlayers().size()) {
this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new DiceNowMessage());
this.gameAutomaton.setCurrentState(this.gameAutomaton.getTurnState());
this.gameAutomaton.getTurnState().setCurrentState(this.gameAutomaton.getTurnState().getPowerCardState());
}