merge Setup branch into develop #1

Merged
SemvdH merged 71 commits from setupBranch into master 2020-10-21 18:59:02 +00:00
Showing only changes of commit f1901f0c35 - Show all commits

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