From 4a400628dfca0073efa2f94c93f6ce3779da710f Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Thu, 22 Oct 2020 17:05:02 +0200 Subject: [PATCH] [FIX] merge stuff --- Client/ViewModels/ViewModel.cs | 3 ++- Server/Models/ServerClient.cs | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Client/ViewModels/ViewModel.cs b/Client/ViewModels/ViewModel.cs index 64e864e..d800b9a 100644 --- a/Client/ViewModels/ViewModel.cs +++ b/Client/ViewModels/ViewModel.cs @@ -87,7 +87,8 @@ namespace Client private void joinLobby() { - + // lobby die je wilt joinen verwijderen + // nieuwe binnengekregen lobby toevoegen client.OnLobbyJoinSuccess = OnLobbyJoinSuccess; client.SendMessage(JSONConvert.ConstructLobbyJoinMessage(SelectedLobby.ID)); } diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs index 3a0388c..6c4f282 100644 --- a/Server/Models/ServerClient.cs +++ b/Server/Models/ServerClient.cs @@ -188,16 +188,11 @@ namespace Server.Models break; case LobbyIdentifier.JOIN: int id = JSONConvert.GetLobbyID(payload); - ServerCommunication.INSTANCE.JoinLobby(this.User, id); - sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage()); - bool isHost; ServerCommunication.INSTANCE.JoinLobby(this.User,id, out isHost); sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage(isHost)); ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray())); - //Task.Run(SendLobbyData); - serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new { id = serverCom.GetLobbyForUser(User).ID,