From a1bbc0b0344bd79ded2a339f8ae98a29ff781964 Mon Sep 17 00:00:00 2001 From: Bruno Da Costa Cunha Date: Wed, 29 Mar 2023 10:30:49 +0200 Subject: [PATCH] =?UTF-8?q?Modification,=20maintenant=20on=20envoie=20un?= =?UTF-8?q?=20bool=20aussi=20pour=20savoir=20qui=20sera=20le=20host=20pour?= =?UTF-8?q?=20les=20coordon=C3=A9es=20de=20la=20balle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/server/Server/PongServer.cs | 11 +++++++---- code/server/Server/Room.cs | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/server/Server/PongServer.cs b/code/server/Server/PongServer.cs index 7bc2121..d4ff319 100644 --- a/code/server/Server/PongServer.cs +++ b/code/server/Server/PongServer.cs @@ -95,9 +95,11 @@ public class PongServer nextPort++; + Tuple dataToSend = new Tuple(room.Port, true); + Console.WriteLine(JsonSerializer.Serialize(dataToSend)); // Send port message to client - byte[] connectionData = Encoding.ASCII.GetBytes(room.Port.ToString()); + byte[] connectionData = Encoding.ASCII.GetBytes(JsonSerializer.Serialize(dataToSend)); serverSocket.Send(connectionData, connectionData.Length, remoteEndPoint); rooms[data.Data.playerId] = room; @@ -108,15 +110,16 @@ public class PongServer private void Join(ObjectTransfert data, IPEndPoint remoteEndPoint, UdpClient serverSocket, Room room) { - - room.playerJoin = new KeyValuePair(data.Data, room.playerHost.Value); Console.WriteLine("New connection Client from " + remoteEndPoint.ToString()); + Tuple dataToSend = new Tuple(room.Port, true); + Console.WriteLine(JsonSerializer.Serialize(dataToSend)); + // Send port message to client - byte[] connectionData = Encoding.ASCII.GetBytes(room.Port.ToString()); + byte[] connectionData = Encoding.ASCII.GetBytes(JsonSerializer.Serialize(dataToSend)); serverSocket.Send(connectionData, connectionData.Length, remoteEndPoint); room.PropertyChanged += room.OnReadyChanged; diff --git a/code/server/Server/Room.cs b/code/server/Server/Room.cs index b33f8b4..79af876 100644 --- a/code/server/Server/Room.cs +++ b/code/server/Server/Room.cs @@ -80,8 +80,6 @@ namespace Server Room room = sender as Room; int maxPlayer = room.nbPlayer; - //IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Any, Port); - //UdpClient serverSocket = new UdpClient(serverEndPoint); if (maxPlayer == 2)