From 2b731eb5bf435f9a2fa487297e0d228caaafed36 Mon Sep 17 00:00:00 2001 From: cxxpxr <60411087+cxxpxr@users.noreply.github.com> Date: Tue, 6 Apr 2021 11:29:09 -0400 Subject: [PATCH] Player count fix --- UnityTransport/Editor/LRMInspector.cs | 7 ++++--- UnityTransport/Editor/LRMInspector.cs.meta | 11 +++++++++++ .../LRMTransport/LightReflectiveMirrorTransport.cs | 10 ++++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 UnityTransport/Editor/LRMInspector.cs.meta diff --git a/UnityTransport/Editor/LRMInspector.cs b/UnityTransport/Editor/LRMInspector.cs index 856dd16..18220fe 100644 --- a/UnityTransport/Editor/LRMInspector.cs +++ b/UnityTransport/Editor/LRMInspector.cs @@ -13,8 +13,9 @@ using kcp2k; #if UNITY_EDITOR namespace LightReflectiveMirror { - [CustomEditor(typeof(LightReflectiveMirrorTransport))] - public class LRMInspector : Editor + [UnityEditor.CustomEditor(typeof(LightReflectiveMirrorTransport))] + + public class LRMInspector : UnityEditor.Editor { int serverPort = 7070; string serverIP; @@ -251,4 +252,4 @@ namespace LightReflectiveMirror } } } -#endif +#endif \ No newline at end of file diff --git a/UnityTransport/Editor/LRMInspector.cs.meta b/UnityTransport/Editor/LRMInspector.cs.meta new file mode 100644 index 0000000..fa00e6b --- /dev/null +++ b/UnityTransport/Editor/LRMInspector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 588870f5e430f334592ddea2aedd6c98 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTransport/LRMTransport/LightReflectiveMirrorTransport.cs b/UnityTransport/LRMTransport/LightReflectiveMirrorTransport.cs index f215ed7..3748269 100644 --- a/UnityTransport/LRMTransport/LightReflectiveMirrorTransport.cs +++ b/UnityTransport/LRMTransport/LightReflectiveMirrorTransport.cs @@ -331,7 +331,7 @@ namespace LightReflectiveMirror { for(int i = 0; i < relayServerList.Count; i++) { - if(relayServerList[i].serverId == serverId) + if(relayServerList[i].serverId == serverID) return relayServerList[i]; } @@ -372,12 +372,18 @@ namespace LightReflectiveMirror public struct Room { public string serverName; - public int currentPlayers; public int maxPlayers; public int serverId; public string serverData; + public int hostId; + public List clients; public RelayAddress relayInfo; + + /// + /// This variable is only available on the client + /// + public int currentPlayers { get => clients.Count + 1; } } [Serializable]