Fixed win condition on forced exit

Assets/Scripts/Board.cs

@@ -101,10 +101,18 @@ private void CheckPlayerNum()
     {
         if (PhotonNetwork.CurrentRoom != null)
         {
+            // For awarding win to player if the other player disconnects
             if (PhotonNetwork.CurrentRoom.PlayerCount <= 1 && !gameCompleted)
             {
-                pv.RPC("EndGame", RpcTarget.All, (IsPlayer1() ? 1 : 2));
-                Debug.Log(PhotonNetwork.LocalPlayer + " Player:" + (IsPlayer1() ? 1 : 2));
+                if (PhotonNetwork.LocalPlayer.ActorNumber == 1)
+                {
+                    pv.RPC("EndGame", RpcTarget.All, 1);
+                }
+                else
+                {
+                    pv.RPC("EndGame", RpcTarget.All, 2);
+                }
+
                 PhotonNetwork.CurrentRoom.IsVisible = false;
                 restartBtn.SetActive(false);
             } 
@@ -492,6 +500,7 @@ void DebugWin()
         }
     }
 
+    //TODO: Win UI not loading properly if someone force closes a game
     //After a person wins announce to both players 
     [PunRPC]
     private void EndGame(int player)

Assets/Scripts/Lobby/Scripts/Launcher.cs

@@ -77,17 +77,7 @@ public override void OnJoinedRoom()
             MenuManager.Instance.OpenMenu("room");
             roomNameText.text = PhotonNetwork.CurrentRoom.Name;
 
-            Player[] players = PhotonNetwork.PlayerList;
-
-            foreach (Transform child in playerListContent)
-            {
-                Destroy(child.gameObject);
-            }
-
-            for (int i = 0; i < players.Count(); i++)
-            {
-                Instantiate(playerListItemPrefab, playerListContent).GetComponent<PlayerListItem>().SetUp(players[i]);
-            }
+            RefreshPlayerList();
 
             startGameButton.SetActive(PhotonNetwork.IsMasterClient);
         }
@@ -133,6 +123,7 @@ public override void OnRoomListUpdate(List<RoomInfo> roomList)
             {
                 Destroy(trans.gameObject);
             }
+
 
             for (int i = 0; i < roomList.Count; i++)
             {
@@ -150,11 +141,30 @@ public override void OnPlayerLeftRoom(Player otherPlayer)
         {
             base.OnPlayerLeftRoom(otherPlayer);
             Debug.Log(otherPlayer.NickName + " has left the game");
+
+            RefreshPlayerList();
         }
 
         public override void OnPlayerEnteredRoom(Player newPlayer)
         {
-            Instantiate(playerListItemPrefab, playerListContent).GetComponent<PlayerListItem>().SetUp(newPlayer);
+            Instantiate(playerListItemPrefab, playerListContent).GetComponent<PlayerListItem>().SetUp(newPlayer, 1);
+
+            RefreshPlayerList();
+        }
+
+        private void RefreshPlayerList()
+        {
+            Player[] players = PhotonNetwork.PlayerList;
+
+            foreach (Transform child in playerListContent)
+            {
+                Destroy(child.gameObject);
+            }
+
+            for (int i = 0; i < players.Count(); i++)
+            {
+                Instantiate(playerListItemPrefab, playerListContent).GetComponent<PlayerListItem>().SetUp(players[i], i + 1);
+            }
         }
     }
 }

Assets/Scripts/Lobby/Scripts/PlayerListItem.cs

@@ -10,10 +10,10 @@ public class PlayerListItem : MonoBehaviourPunCallbacks
         [SerializeField] TMP_Text text = default;
         Player player;
 
-        public void SetUp(Player _player)
+        public void SetUp(Player p, int playerNum)
         {
-            player = _player;
-            text.text = _player.NickName;
+            player = p;
+            text.text = "Player " + playerNum;
         }
 
         public override void OnPlayerLeftRoom(Player otherPlayer)