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

4
Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
View File

@@ -218,10 +218,12 @@ public void connectionAdded(Server server, HostedConnection hostedConnection) {
} else { } else {
if (hostedConnection.getAddress().contains("127.0.0.1") && this.logic.getGame().getHost() == -1) { if (hostedConnection.getAddress().contains("127.0.0.1") && this.logic.getGame().getHost() == -1) {
this.logic.getGame().setHost(hostedConnection.getId()); this.logic.getGame().setHost(hostedConnection.getId());
} this.logic.getServerSender().send(hostedConnection.getId(), new LobbyAcceptMessage(hostedConnection.getId()));
} else {
this.logic.getServerSender().send(hostedConnection.getId(), new LobbyAcceptMessage()); this.logic.getServerSender().send(hostedConnection.getId(), new LobbyAcceptMessage());
} }
} }
}
@Override @Override
public void connectionRemoved(Server server, HostedConnection hostedConnection) { public void connectionRemoved(Server server, HostedConnection hostedConnection) {