Merge remote-tracking branch 'origin/develop' into newDoctor

2020-10-16 12:51:42 +02:00
parent aadbbc16a9 2ebfea1a01
commit e3c580c8c2
35 changed files with 1269 additions and 113 deletions
--- a/Server/Communication.cs
+++ b/Server/Communication.cs
@@ -35,15 +35,6 @@ namespace Server
            var tcpClient = listener.EndAcceptTcpClient(ar);
            Console.WriteLine($"Client connected from {tcpClient.Client.RemoteEndPoint}");
            clients.Add(new Client(this, tcpClient));
-            /*if (doctor == null)
-            {
-                doctor = clients.ElementAt(0);
-            }
-            else
-            {
-
-                doctor.sendMessage(DataParser.getNewConnectionJson("jan"));
-            }*/
            listener.BeginAcceptTcpClient(new AsyncCallback(OnConnect), null);
        }