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

merge Setup branch into develop #1

Merged
SemvdH merged 71 commits from setupBranch into master 2020-10-21 18:59:02 +00:00
Conversation 2 Commits 71 Files Changed 42 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f1901f0c35 - Show all commits

4
Server/Models/ServerCommunication.cs
View File

@@ -117,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) foreach (Lobby l in lobbies)
{ {
if (l == lobby) if (l == lobby)
{ {
bool succ; bool succ;
l.AddUser(username, out succ); l.AddUser(user, out succ);
if (!succ) if (!succ)
{ {
// TODO send lobby full message // TODO send lobby full message