From 68ad9ef8fef74ec1ffd2d064c132659118ae7fcc Mon Sep 17 00:00:00 2001
From: cxxpxr <60411087+cxxpxr@users.noreply.github.com>
Date: Thu, 8 Jul 2021 07:32:58 -0400
Subject: [PATCH] Flip define and add some logging

---
 .../LRM_LoadBalancer/Endpoint/Endpoint.cs     |  3 +-
 UnityProject/Assets/LRMTestScene.unity        |  4 +--
 .../LRM/LRMTransport/LRMTransportOverrides.cs | 32 +++++++++++--------
 .../LRM/LRMTransport/LRMTransportRequests.cs  |  4 +--
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Endpoint/Endpoint.cs b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Endpoint/Endpoint.cs
index 4acef85..61a3cce 100644
--- a/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Endpoint/Endpoint.cs
+++ b/LoadBalancerProject-DONT-IMPORT-INTO-UNITY/LRM_LoadBalancer/Endpoint/Endpoint.cs
@@ -249,8 +249,9 @@ namespace LightReflectiveMirror.LoadBalancing
 
                 return true;
             }
-            catch
+            catch (Exception e)
             {
+                Logger.ForceLogMessage(e.ToString(), ConsoleColor.Red);
                 return false;
             }
         }
diff --git a/UnityProject/Assets/LRMTestScene.unity b/UnityProject/Assets/LRMTestScene.unity
index 13cf196..04167cc 100644
--- a/UnityProject/Assets/LRMTestScene.unity
+++ b/UnityProject/Assets/LRMTestScene.unity
@@ -1238,7 +1238,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   clientToServerTransport: {fileID: 1521806211}
-  serverIP: localhost
+  serverIP: 68.174.160.78
   serverPort: 7777
   endpointServerPort: 8080
   heartBeatInterval: 3
@@ -1254,7 +1254,7 @@ MonoBehaviour:
   loadBalancerAddress: 127.0.0.1
   serverName: My awesome server!
   extraServerData: Map 1
-  maxServerPlayers: 10
+  maxServerPlayers: 2
   isPublicServer: 1
   serverListUpdated:
     m_PersistentCalls:
diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportOverrides.cs b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportOverrides.cs
index 1b5b57e..c1382d5 100644
--- a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportOverrides.cs
+++ b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportOverrides.cs
@@ -151,21 +151,8 @@ namespace LightReflectiveMirror
             }
         }
 
-#if MIRROR_37_0_OR_NEWER
-        public override void ServerDisconnect(int connectionId)
-        {
-            if (_connectedRelayClients.TryGetBySecond(connectionId, out int relayId))
-            {
-                int pos = 0;
-                _clientSendBuffer.WriteByte(ref pos, (byte)OpCodes.KickPlayer);
-                _clientSendBuffer.WriteInt(ref pos, relayId);
-                return;
-            }
+#if !MIRROR_37_0_OR_NEWER
 
-            if (_connectedDirectClients.TryGetBySecond(connectionId, out int directId))
-                _directConnectModule.KickClient(directId);
-        }
-#else
         public override bool ServerDisconnect(int connectionId)
         {
             if (_connectedRelayClients.TryGetBySecond(connectionId, out int relayId))
@@ -181,6 +168,23 @@ namespace LightReflectiveMirror
 
             return false;
         }
+
+#else
+
+        public override void ServerDisconnect(int connectionId)
+        {
+            if (_connectedRelayClients.TryGetBySecond(connectionId, out int relayId))
+            {
+                int pos = 0;
+                _clientSendBuffer.WriteByte(ref pos, (byte)OpCodes.KickPlayer);
+                _clientSendBuffer.WriteInt(ref pos, relayId);
+                return;
+            }
+
+            if (_connectedDirectClients.TryGetBySecond(connectionId, out int directId))
+                _directConnectModule.KickClient(directId);
+        }
+
 #endif
 
 #if MIRROR_40_0_OR_NEWER
diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportRequests.cs b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportRequests.cs
index 8dd1326..a066ee2 100644
--- a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportRequests.cs
+++ b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportRequests.cs
@@ -204,7 +204,7 @@ namespace LightReflectiveMirror
 
                     case UnityWebRequest.Result.Success:
                         relayServerList?.Clear();
-                        relayServerList = JsonUtilityHelper.FromJson<Room>(result.Decompress()).ToList();
+                        relayServerList = JsonUtilityHelper.FromJson<Room>(result).ToList();
                         serverListUpdated?.Invoke();
                         _serverListUpdated = true;
                         break;
@@ -217,7 +217,7 @@ namespace LightReflectiveMirror
                 else
                 {
                     relayServerList?.Clear();
-                    relayServerList = JsonUtilityHelper.FromJson<Room>(result.Decompress()).ToList();
+                    relayServerList = JsonUtilityHelper.FromJson<Room>(result).ToList();
                     serverListUpdated?.Invoke();
                     _serverListUpdated = true;
                 }