fix: Fixing IndexChanged hook not being called for NetworkRoomPlayer …

…(#2242) * adding Server to make sure index is only changed on the server * removing calls to RecalculateRoomPlayerIndices on client
MirageNet · Sep 13, 2020 · 94da8ae · 94da8ae
1 parent 0c78fa0
commit 94da8ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Assets/Mirror/Components/NetworkRoomManager.cs b/Assets/Mirror/Components/NetworkRoomManager.cs
@@ -330,6 +330,7 @@ public override void OnServerAddPlayer(NetworkConnection conn)
                 OnRoomServerAddPlayer(conn);
         }
 
+        [Server]
         public void RecalculateRoomPlayerIndices()
         {
             if (roomSlots.Count > 0)

diff --git a/Assets/Mirror/Components/NetworkRoomPlayer.cs b/Assets/Mirror/Components/NetworkRoomPlayer.cs
@@ -56,7 +56,9 @@ public void Start()
                     DontDestroyOnLoad(gameObject);
 
                 room.roomSlots.Add(this);
-                room.RecalculateRoomPlayerIndices();
+
+                if (NetworkServer.active)
+                    room.RecalculateRoomPlayerIndices();
 
                 if (NetworkClient.active)
                     room.CallOnClientEnterRoom();
@@ -69,8 +71,8 @@ public virtual void OnDisable()
         {
             if (NetworkClient.active && NetworkManager.singleton is NetworkRoomManager room)
             {
+                // only need to call this on client as server removes it before object is destroyed
                 room.roomSlots.Remove(this);
-                room.RecalculateRoomPlayerIndices();
 
                 room.CallOnClientExitRoom();
             }