Barrel respawn fix, remote server restart, player connect events

Fixed bug of respawning barrels due to RpcDespawnAll being too fast.
Improved headless server argument support logic, enabled a new admin
password to restart server, and moved it away from Mirror library.
Prevented ShatterPart exception when the car respawns.
Added player connect & disconnect events + displaying their count.

Author: scscgit

Assets/Game/Prefabs/Network/NetworkManager.prefab

@@ -103,7 +103,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   dontDestroyOnLoad: 1
   runInBackground: 1
-  startOnHeadless: 1
+  startOnHeadless: 0
   showDebugMessages: 0
   serverTickRate: 30
   offlineScene: Assets/Game/Scenes/MainMenu.unity

Assets/Game/Prefabs/UI/MultiplayerUI.prefab

@@ -835,7 +835,7 @@ MonoBehaviour:
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
     m_DisabledTrigger: Disabled
-  m_Interactable: 1
+  m_Interactable: 0
   m_TargetGraphic: {fileID: 3152670386605946882}
   m_OnClick:
     m_PersistentCalls:

Assets/Game/Prefabs/UI/Ping.prefab

@@ -116,8 +116,6 @@ MonoBehaviour:
   syncMode: 0
   syncInterval: 0.1
   pingText: {fileID: 3519340171003635037}
-  intervalByServer: 0.5
-  ping: 0
 --- !u!114 &114523307598928054
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -166,9 +164,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.04, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
+  m_SizeDelta: {x: 0, y: 30}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &3519340171003635036
 CanvasRenderer:
@@ -209,4 +207,4 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: New Text
+  m_Text: 'Ping: 9999ms (999 players)'

Assets/Game/Scripts/Network/Environment.cs

@@ -52,20 +52,35 @@ private void SpawnAll()
 
         public void RespawnAll()
         {
-            RpcDespawnAll();
+            RpcDespawnAllOnClient();
+            DespawnAll();
             SpawnAll();
         }
 
+        [ClientRpc]
+        public void RpcDespawnAllOnClient()
+        {
+            // Clients need to clean up their locally spawned objects
+            if (isServer)
+            {
+                return;
+            }
+
+            DespawnAll();
+        }
+
         /// <summary>
         /// When called on server, de-spawns all barrels.
         /// When called on a client, de-spawns all dynamically registered local detachable objects.
         /// </summary>
-        [ClientRpc]
-        public void RpcDespawnAll()
+        private void DespawnAll()
         {
             foreach (var spawnedObject in _spawnedObjects)
             {
-                Destroy(spawnedObject);
+                if (spawnedObject)
+                {
+                    Destroy(spawnedObject);
+                }
             }
 
             _spawnedObjects.Clear();

Assets/Game/Scripts/Network/GameNetworkPlayer.cs

@@ -10,6 +10,7 @@ namespace Game.Scripts.Network
     public class GameNetworkPlayer : NetworkBehaviour
     {
         public static GameNetworkPlayer LocalPlayer;
+        public static int PlayerCount;
 
         public const float StartHealth = 100;
 
@@ -27,25 +28,25 @@ public class GameNetworkPlayer : NetworkBehaviour
         [SyncVar(hook = nameof(OnSyncHealth))] public float health;
 
         private NetworkIdentity _identity;
-        private ArenaUi _arenaUi;
         private Camera _spectatorCamera;
         private HoveringDetails _hoveringDetails;
         private bool _inCarSelection;
 
         [SyncVar] private GameObject _car;
         private int _carIndex;
         private VehiclePhysics _vehiclePhysics;
+        private bool _quitting;
 
         public GameObject Car => _car;
 
         public void Start()
         {
-            CmdInitialize(MainMenu.PlayerName);
+            PlayerCount++;
             _identity = GetComponent<NetworkIdentity>();
-            _arenaUi = GameObject.Find("ArenaUI").GetComponent<ArenaUi>();
             // If this is the local player, then the Start means he has just has just connected, so he will pick a car
             if (isLocalPlayer)
             {
+                CmdInitialize(MainMenu.PlayerName);
                 LocalPlayer = this;
                 _spectatorCamera = GameObject.Find("SpectatorCamera").GetComponent<Camera>()
                                    ?? throw new NullReferenceException($"Missing SpectatorCamera");
@@ -60,10 +61,27 @@ public void Start()
             // If the car wasn't spawned yet, then wait for the RPC callback
         }
 
+        private void OnDestroy()
+        {
+            if (!_quitting && !isLocalPlayer)
+            {
+                DisplayPositiveEvent($"{playerName}: Disconnected", true);
+            }
+
+            PlayerCount--;
+        }
+
+        private void OnApplicationQuit()
+        {
+            _quitting = true;
+        }
+
         [Command]
         public void CmdInitialize(string playerName)
         {
             this.playerName = playerName;
+            // RPC doesn't have access to the playerName yet
+            RpcDisplayPositiveEvent($"{playerName}: Connected", true);
         }
 
         /// <summary>
@@ -79,7 +97,7 @@ public void ChangeCarByLocalPlayer()
 
             _spectatorCamera.gameObject.SetActive(false);
             vehicleCamera.gameObject.SetActive(false);
-            _arenaUi.DisableUi();
+            ArenaUi.Instance.DisableUi();
             // Ensure that the car selection scene is never loaded twice
             if (!_inCarSelection)
             {
@@ -164,7 +182,7 @@ public void RpcOnSpawnedCar(GameObject car, bool byNewRound)
             health = StartHealth;
             if (isLocalPlayer)
             {
-                _arenaUi.EnableUi(this);
+                ArenaUi.Instance.EnableUi(this);
                 _spectatorCamera.gameObject.SetActive(false);
                 vehicleCamera.gameObject.SetActive(true);
                 vehicleCamera.playerCar = car.transform;
@@ -259,13 +277,13 @@ public void RpcDisplayHealth(float displayHealth)
         [ClientRpc]
         public void RpcDisplayPlayerHitEvent(string player2, float health, int score)
         {
-            _arenaUi.DisplayPlayerHitEvent(playerName, player2, health, score);
+            ArenaUi.Instance.DisplayPlayerHitEvent(playerName, player2, health, score);
         }
 
         [ClientRpc]
         public void RpcDisplayObjectHitEvent(string by, float hp)
         {
-            _arenaUi.DisplayObjectHitEvent(playerName, by, hp);
+            ArenaUi.Instance.DisplayObjectHitEvent(playerName, by, hp);
         }
 
         [ClientRpc]
@@ -276,7 +294,17 @@ public void RpcDisplayPositiveEvent(string positiveMessage, bool announcement)
 
         public void DisplayPositiveEvent(string positiveMessage, bool announcement)
         {
-            _arenaUi.DisplayPositiveEvent(!announcement ? $"{playerName}: {positiveMessage}" : positiveMessage);
+            ArenaUi.Instance.DisplayPositiveEvent(!announcement ? $"{playerName}: {positiveMessage}" : positiveMessage);
+        }
+
+        [Command]
+        public void CmdRestartServer(string remoteAdminPassword)
+        {
+            Debug.Log($"Attempt of {playerName} to restart server using password {remoteAdminPassword}");
+            if (MainMenu.RemoteAdminPassword != null && MainMenu.RemoteAdminPassword.Equals(remoteAdminPassword))
+            {
+                GameObject.Find("NetworkManager").GetComponent<NetworkManager>().StopHost();
+            }
         }
     }
 }

Assets/Game/Scripts/Network/VehicleSync.cs

@@ -73,7 +73,8 @@ public class SyncListVehicleInput : SyncList<VehicleInput>{}
 
 	VehicleInput currentVehicleInputs = new VehicleInput ();
 	VehicleTransform currentVehicleTransform = new VehicleTransform ();
-	VehicleLights currentVehicleLights = new VehicleLights ();
+    // TODO: there was = new VehicleLights();
+	VehicleLights currentVehicleLights;
 
 	bool CB_running = false;
 

Assets/Game/Scripts/UI/ArenaUi.cs

@@ -8,6 +8,8 @@ namespace Game.Scripts.UI
 {
     public class ArenaUi : MonoBehaviour
     {
+        public static ArenaUi Instance;
+
         private enum EventType
         {
             PlayerHit,
@@ -34,6 +36,11 @@ private enum EventType
         private Tuple<string, string, float> _lastObjectHitEvent =
             new Tuple<string, string, float>(null, null, 0);
 
+        private void Awake()
+        {
+            Instance = this;
+        }
+
         void Start()
         {
             for (var childIndex = 0; childIndex < events.transform.childCount; childIndex++)

Assets/Game/Scripts/UI/MainMenu.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using Game.Scripts.Network;
 using Mirror;
+using Mirror.Websocket;
 using UnityEngine;
 using UnityEngine.UI;
 using Random = System.Random;
@@ -12,10 +13,12 @@ public class MainMenu : MonoBehaviour
     {
         public static string PlayerName;
         public static bool ShouldReconnect;
+        public static string RemoteAdminPassword;
 
         [Header("Settings pages")] public GameObject menuPage;
         public GameObject settingsPage;
         [Header("Text callbacks")] public InputField playerInput;
+        private bool _headlessServerStarted;
 
         private NetworkManager _networkManager;
 
@@ -42,6 +45,32 @@ private void OnEnable()
             }
         }
 
+        private void HeadlessServerStart()
+        {
+            Debug.Log("Running server in a headless mode. Following command line argument formats are supported:\n* Change the listening port:\n    port 7778\n* Enable remote administration using password:\n    admin MySecretPassword");
+            var args = System.Environment.GetCommandLineArgs();
+            for (int argsIndex = 2; argsIndex < args.Length - 1; argsIndex += 2)
+            {
+                switch (args[argsIndex])
+                {
+                    case "port":
+                    case "-port":
+                    case "--port":
+                        Debug.Log(
+                            $"Switching {(int.TryParse(args[argsIndex + 1], out var port) ? $"to port {(_networkManager.GetComponent<WebsocketTransport>().port = port).ToString()}" : $"port failed, cannot recognize {args[argsIndex + 1]}")}");
+                        break;
+                    case "admin":
+                    case "-admin":
+                    case "--admin":
+                        Debug.Log(
+                            $"Setting remote administration password to: ${RemoteAdminPassword = args[argsIndex + 1]}");
+                        break;
+                }
+            }
+
+            _networkManager.StartHost();
+        }
+
         private void InitializePlayerName()
         {
             // Player's name initialization
@@ -141,6 +170,16 @@ private void InitializePlayerName()
 
         private void Update()
         {
+            // Called when running using server build, or after invoking command GameNetworkPlayer.CmdRestartServer
+            // This has to be called from Update instead of Start or OnEnable in order to properly initialize
+            if (NetworkManager.isHeadless && !_headlessServerStarted)
+            {
+                _headlessServerStarted = true;
+                PlayerName = "Server";
+                HeadlessServerStart();
+                return;
+            }
+
             if (Input.GetKeyDown(KeyCode.Return) || Input.GetKeyDown(KeyCode.KeypadEnter))
             {
                 if (menuPage.activeInHierarchy)

Assets/Game/Scripts/UI/Ping.cs

@@ -1,3 +1,4 @@
+using Game.Scripts.Network;
 using UnityEngine;
 using Mirror;
 using UnityEngine.UI;
@@ -8,11 +9,12 @@ public class Ping : NetworkBehaviour
 
     private void Start()
     {
-        transform.parent = GameObject.Find("Managers").transform;
+        transform.SetParent(GameObject.Find("Managers").transform);
     }
 
     void Update()
     {
-        pingText.text = $"Ping : {(int) (NetworkTime.rtt * 1000 / 2)}ms";
+        var playerCount = GameNetworkPlayer.PlayerCount - 1;
+        pingText.text = $"Ping: {(int) (NetworkTime.rtt * 1000 / 2)}ms ({playerCount} player{(playerCount == 1 ? "" : "s")})";
     }
 }

Assets/Mirror/Runtime/NetworkManager.cs

@@ -236,18 +236,7 @@ public virtual void Start()
             // (tick rate is applied in StartServer!)
             if (isHeadless && startOnHeadless)
             {
-                var args = Environment.GetCommandLineArgs();
-                if (args.Length == 3 && new[] {"port", "-port", "--port"}.Contains(args[1]))
-                {
-                    Debug.Log(
-                        $"Switching {(int.TryParse(args[2], out var port) ? $"to port {(GetComponent<WebsocketTransport>().port = port).ToString()}" : $"port failed, cannot recognize {args[2]}")}");
-                }
-                else
-                {
-                    Debug.Log("If you need to change the listening port, consider using a \"port\" parameter");
-                }
-
-                StartHost();
+                StartServer();
             }
         }