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

2
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/GameState.java
View File

@@ -4,6 +4,7 @@
import pp.mdga.message.client.DisconnectedMessage;
import pp.mdga.message.client.LeaveGameMessage;
import pp.mdga.message.client.RequestDieMessage;
import pp.mdga.message.server.CeremonyMessage;
import pp.mdga.message.server.PauseGameMessage;
import pp.mdga.server.automaton.game.AnimationState;
import pp.mdga.server.automaton.game.DetermineStartPlayerState;
@@ -82,6 +83,7 @@ public void received(DisconnectedMessage msg, int from) {
public void received(LeaveGameMessage msg, int from) {
this.logic.getGame().updatePlayerActiveState(from, false);
if (this.logic.getGame().getNumberOfActivePlayers() == 1) {
this.logic.getServerSender().broadcast(new CeremonyMessage());
this.logic.setCurrentState(this.logic.getCeremonyState());
}
}