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

12
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/ServerState.java
View File

@@ -1,6 +1,8 @@
package pp.mdga.server.automaton; package pp.mdga.server.automaton;
import pp.mdga.message.client.*; import pp.mdga.message.client.*;
import pp.mdga.message.server.LobbyPlayerLeaveMessage;
import pp.mdga.message.server.ShutdownMessage;
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
/** /**
@@ -75,7 +77,15 @@ public void received(JoinedLobbyMessage msg, int from) {}
* @param msg as the message which was sent by the player as a LeaveGameMessage object. * @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. * @param from as the client id of the player as an Integer.
*/ */
public void received(LeaveGameMessage msg, int from) {} public void received(LeaveGameMessage msg, int from) {
if (from == this.logic.getGame().getHost()) {
this.logic.getServerSender().broadcast(new ShutdownMessage());
this.logic.getServerSender().shutdown();
}
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 LobbyReadyMessage message. * This method will be called whenever the server received a LobbyReadyMessage message.