sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] fixed merge conflicts

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-21 20:56:38 +02:00
parent 298bd760e5 a4e45b1a6b
commit 61577e0df7
9 changed files with 94 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Server/Models/ServerClient.cs
View File

@@ -1,5 +1,7 @@

using Client;
using Newtonsoft.Json.Linq;
using SharedClientServer;
using System;
using System.Collections.Generic;
@@ -18,6 +20,7 @@ namespace Server.Models
private byte[] totalBuffer = new byte[1024];
private int totalBufferReceived = 0;
public User User { get; set; }
private ServerCommunication serverCom = ServerCommunication.INSTANCE;
/// <summary>
@@ -119,7 +122,11 @@ namespace Server.Models
string textUsername = combo.Item1;
string textMsg = combo.Item2;
Debug.WriteLine("[SERVERCLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
// todo handle sending to all except this user the username and message to display in chat
serverCom.SendToLobby(ServerCommunication.INSTANCE.GetLobbyForUser(User),payload);
Debug.WriteLine("Payload has been sent!");
break;
case JSONConvert.LOBBY: