peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Version 1.0 #40

Merged
j23f0779 merged 947 commits from development2 into main 2024-12-13 10:26:49 +01:00
Conversation 2 Commits 947 Files Changed 528 +6 -4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9af20346f1 - Show all commits

10
Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java
View File

@@ -108,8 +108,9 @@ private void tryHost() {
} catch (InterruptedException ignored) { } catch (InterruptedException ignored) {
} }
hostDialog.connectServerAsClient(); hostDialog.connectServerAsClient();
while (hostDialog.getNetwork().isConnected()){ try {
int i = 2; Thread.sleep(1000);
} catch (InterruptedException ignored) {
} }
app.getModelSynchronize().setHost(port); app.getModelSynchronize().setHost(port);
//app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT); //app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
@@ -139,8 +140,9 @@ private void tryJoin() {
app.getModelSynchronize().setName(startDialog.getName()); app.getModelSynchronize().setName(startDialog.getName());
joinDialog.setHostname(ip); joinDialog.setHostname(ip);
joinDialog.connectToServer(); joinDialog.connectToServer();
while (!joinDialog.getNetwork().isConnected()){ try {
int i = 2; Thread.sleep(1000);
} catch (InterruptedException ignored) {
} }
app.getModelSynchronize().setJoin(ip, port); app.getModelSynchronize().setJoin(ip, port);
return; return;