Merge branch 'feature/jsonForWords' into fix-async-stuff

This commit is contained in:
Sem van der Hoeven
2020-10-22 16:37:05 +02:00
2 changed files with 4 additions and 2 deletions

View File

@@ -90,9 +90,9 @@ namespace Server.Models
}
ar.AsyncWaitHandle.WaitOne();
// start reading for a new message
stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
}
catch (IOException e)
{
@@ -192,7 +192,7 @@ namespace Server.Models
sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage());
ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
Task.Run(SendLobbyData);
//Task.Run(SendLobbyData);
serverCom.sendToAll(JSONConvert.GetMessageToSend(JSONConvert.RANDOMWORD, new
{
@@ -214,6 +214,7 @@ namespace Server.Models
string result = await WaitForData();
if(result == "bruh momento")
{
}
}