From 9069c7e79cc2833b1ed542b739c4edd3eec7236d Mon Sep 17 00:00:00 2001 From: Derek S <44935661+Derek-R-S@users.noreply.github.com> Date: Tue, 6 Apr 2021 20:30:21 -0500 Subject: [PATCH] Fixed coopers errors he left --- .../LRM/RelayHandler/RelayHandlerCallbacks.cs | 2 +- .../LRM/RelayHandler/RelayHandlerRoomMethods.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandlerCallbacks.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandlerCallbacks.cs index ca8fdc8..11892d4 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandlerCallbacks.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandlerCallbacks.cs @@ -62,7 +62,7 @@ namespace LightReflectiveMirror LeaveRoom(clientId); break; case OpCodes.JoinServer: - JoinRoom(clientId, data.ReadInt(ref pos), data.ReadBool(ref pos), data.ReadString(ref pos)); + JoinRoom(clientId, data.ReadString(ref pos), data.ReadBool(ref pos), data.ReadString(ref pos)); break; case OpCodes.KickPlayer: LeaveRoom(data.ReadInt(ref pos), clientId); diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandlerRoomMethods.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandlerRoomMethods.cs index 63f0d43..ebda9a6 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandlerRoomMethods.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandlerRoomMethods.cs @@ -33,7 +33,7 @@ namespace LightReflectiveMirror /// The server ID of the room /// If the client is capable of a direct connection /// The local IP of the client joining - void JoinRoom(int clientId, int serverId, bool canDirectConnect, string localIP) + void JoinRoom(int clientId, string serverId, bool canDirectConnect, string localIP) { LeaveRoom(clientId); @@ -151,7 +151,7 @@ namespace LightReflectiveMirror byte[] sendBuffer = _sendBuffers.Rent(5); sendBuffer.WriteByte(ref pos, (byte)OpCodes.RoomCreated); - sendBuffer.WriteInt(ref pos, clientId); + sendBuffer.WriteString(ref pos, room.serverId); Program.transport.ServerSend(clientId, 0, new ArraySegment(sendBuffer, 0, pos)); _sendBuffers.Return(sendBuffer);