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

Merge remote-tracking branch 'origin/setupBranch' into setupBranch

Browse Source
This commit is contained in:
Dogukan
2020-10-20 19:53:35 +02:00
parent 7dbdcc8bcc 3255ae885b
commit 4d161391b1
16 changed files with 298 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Server/Models/ServerCommunication.cs
View File

@@ -17,6 +17,7 @@ namespace Server.Models
public List<Lobby> lobbies;
private Dictionary<Lobby, List<ServerClient>> serverClientsInlobbies;
public Action newClientAction;
/// <summary>
/// use a padlock object to make sure the singleton is thread-safe
@@ -97,7 +98,7 @@ namespace Server.Models
{
foreach (ServerClient sc in serverClients)
{
if (sc.Username != username) sc.sendMessage(message);
if (sc.User.Username != username) sc.sendMessage(message);
}
}
@@ -116,14 +117,14 @@ namespace Server.Models
}
}
public void AddToLobby(Lobby lobby, string username)
public void AddToLobby(Lobby lobby, User user)
{
foreach (Lobby l in lobbies)
{
if (l == lobby)
{
bool succ;
l.AddUser(username, out succ);
l.AddUser(user, out succ);
if (!succ)
{
// TODO send lobby full message
@@ -131,7 +132,7 @@ namespace Server.Models
{
foreach(ServerClient sc in serverClients)
{
if (sc.Username == username)
if (sc.User.Username == user.Username)
{
serverClientsInlobbies[l].Add(sc);
break;