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 +1412 -310
39 changed files with 1412 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 002a42be38 - Show all commits

17
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java
View File

@@ -143,23 +143,6 @@ public void received(LobbyNotReadyMessage msg, int from) {
this.logic.getServerSender().broadcast(new UpdateReadyMessage(from, false));
}
/**
* This method will be called whenever the server received an LeaveGameMessage message.
* It will also get the client id of the player who send this message.
*
* @param msg as the message which was sent by the player as a LeaveGameMessage object.
* @param from as the client id of the player as an Integer.
*/
@Override
public void received(LeaveGameMessage msg, int from) {
if (from == this.logic.getGame().getHost()) {
this.logic.getServerSender().broadcast(new ShutdownMessage());
}
this.logic.getGame().removePlayer(from);
this.logic.getServerSender().broadcast(new LobbyPlayerLeaveMessage(from));
this.logic.getServerSender().disconnectClient(from);
}
/**
* This method will be called whenever the server received a StartGame message.
* It will also get the client id of the player who send this message.