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 e90d782887 - Show all commits

View File

@@ -99,7 +99,7 @@ namespace Server.Models
{ {
foreach (ServerClient sc in serverClients) foreach (ServerClient sc in serverClients)
{ {
if (sc.Username != username) sc.sendMessage(message); if (sc.User.Username != username) sc.sendMessage(message);
} }
} }
@@ -134,7 +134,7 @@ namespace Server.Models
foreach(ServerClient sc in serverClients) foreach(ServerClient sc in serverClients)
{ {
if (sc.Username == user.Username) if (sc.User.Username == user.Username)
{ {
serverClientsInlobbies[l].Add(sc); serverClientsInlobbies[l].Add(sc);
break; break;