fix: fixing errors in tanks sample

- fixing use of world - adding checks so client code only runs on client
MirageNet · May 30, 2021 · ed99d05 · ed99d05
1 parent a9f8319
commit ed99d05
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/Assets/Mirage/Samples~/Tanks/Scripts/TankGameManager.cs b/Assets/Mirage/Samples~/Tanks/Scripts/TankGameManager.cs
@@ -22,22 +22,24 @@ public class TankGameManager : MonoBehaviour
         public List<Tank> players = new List<Tank>();
         public NetworkManager NetworkManager;
 
-
         void Update()
         {
             if (NetworkManager.IsNetworkActive)
             {
                 GameReadyCheck();
                 GameOverCheck();
 
-                if (LocalPlayer == null)
-                {
-                    FindLocalTank();
-                }
-                else
+                if (NetworkManager.Client.Active)
                 {
-                    ShowReadyMenu();
-                    UpdateStats();
+                    if (LocalPlayer == null)
+                    {
+                        FindLocalTank();
+                    }
+                    else
+                    {
+                        ShowReadyMenu();
+                        UpdateStats();
+                    }
                 }
             }
             else
@@ -84,7 +86,8 @@ void GameReadyCheck()
 
         void CheckPlayersNotInList()
         {
-            foreach (NetworkIdentity identity in NetworkManager.Client.World.SpawnedIdentities)
+            NetworkWorld world = NetworkManager.Server.Active ? NetworkManager.Server.World : NetworkManager.Client.World;
+            foreach (NetworkIdentity identity in world.SpawnedIdentities)
             {
                 Tank comp = identity.GetComponent<Tank>();
                 if (comp != null && !players.Contains(comp))
@@ -145,11 +148,13 @@ int GetAlivePlayerCount()
 
         void FindLocalTank()
         {
-            //Check to see if the player is loaded in yet
-            if (NetworkManager.Client.Player == null)
+            INetworkPlayer player = NetworkManager.Client.Player;
+
+            // Check to see if the player object is loaded in yet
+            if (player.Identity == null)
                 return;
 
-            LocalPlayer = NetworkManager.Client.Player.Identity.GetComponent<Tank>();
+            LocalPlayer = player.Identity.GetComponent<Tank>();
         }
 
         void UpdateStats()