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 +9 -2
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fd3b926316 - Show all commits

6
Server/Models/ServerClient.cs
View File

@@ -94,8 +94,12 @@ namespace Server.Models
case 0x01: case 0x01:
// json log in username data // json log in username data
string uName = JSONConvert.GetUsernameLogin(message); string uName = JSONConvert.GetUsernameLogin(message);
if (uName != null) Username = uName; if (uName != null)
{
Username = uName;
Debug.WriteLine("[SERVERCLIENT] set username to " + Username); Debug.WriteLine("[SERVERCLIENT] set username to " + Username);
}
break; break;
case 0x02: case 0x02:
// json message data // json message data

3
Server/Models/ServerCommunication.cs
View File

@@ -126,6 +126,9 @@ namespace Server.Models
if (!succ) if (!succ)
{ {
// TODO send lobby full message // TODO send lobby full message
} else
{
// TODO add serverclient to lobbies dict
} }
break; break;
} }