fix: moving syncvar sender to networkserver so it gets intilized earlier

fixes SyncVarSender being null sometimes when Server.Started is called
MirageNet · Jun 1, 2021 · 8b2b828 · 8b2b828
1 parent 850c4b9
commit 8b2b828
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Assets/Mirage/Runtime/INetworkServer.cs b/Assets/Mirage/Runtime/INetworkServer.cs
@@ -63,6 +63,8 @@ public interface INetworkServer
 
         NetworkWorld World { get; }
 
+        SyncVarSender SyncVarSender { get; }
+
         IReadOnlyCollection<INetworkPlayer> Players { get; }
 
         void Stop();

diff --git a/Assets/Mirage/Runtime/NetworkBehaviour.cs b/Assets/Mirage/Runtime/NetworkBehaviour.cs
@@ -220,7 +220,7 @@ private void SyncObject_OnChange()
         {
             if (IsServer)
             {
-                ServerObjectManager.SyncVarSender.AddDirtyObject(NetIdentity);
+                Server.SyncVarSender.AddDirtyObject(NetIdentity);
             }
         }
 
@@ -377,7 +377,7 @@ public void SetDirtyBit(ulong dirtyBit)
         {
             SyncVarDirtyBits |= dirtyBit;
             if (IsServer)
-                ServerObjectManager.SyncVarSender.AddDirtyObject(NetIdentity);
+                Server.SyncVarSender.AddDirtyObject(NetIdentity);
         }
 
         /// <summary>

diff --git a/Assets/Mirage/Runtime/NetworkServer.cs b/Assets/Mirage/Runtime/NetworkServer.cs
@@ -140,6 +140,8 @@ public class NetworkServer : MonoBehaviour, INetworkServer
         public NetworkTime Time { get; } = new NetworkTime();
 
         public NetworkWorld World { get; private set; }
+        public SyncVarSender SyncVarSender { get; private set; }
+
 
         /// <summary>
         /// This shuts down the server and disconnects all clients.
@@ -199,6 +201,8 @@ public void StartServer(NetworkClient localClient = null)
 
             LocalClient = localClient;
             World = new NetworkWorld();
+            SyncVarSender = new SyncVarSender();
+
 
             ISocket socket = SocketFactory.CreateServerSocket();
             var dataHandler = new DataHandler(connections);
@@ -246,6 +250,7 @@ void ThrowIfSocketIsMissing()
         private void Update()
         {
             peer?.Update();
+            SyncVarSender?.Update();
         }
 
         private void Peer_OnConnected(IConnection conn)
@@ -293,6 +298,9 @@ private void Cleanup()
             _onStopHost.Reset();
             _stopped.Reset();
 
+            World = null;
+            SyncVarSender = null;
+
             Application.quitting -= Stop;
 
             if (peer != null)

diff --git a/Assets/Mirage/Runtime/ServerObjectManager.cs b/Assets/Mirage/Runtime/ServerObjectManager.cs
@@ -49,8 +49,6 @@ public class ServerObjectManager : MonoBehaviour, IServerObjectManager
         uint nextNetworkId = 1;
         uint GetNextNetworkId() => checked(nextNetworkId++);
 
-        public SyncVarSender SyncVarSender { get; private set; }
-
         public void Start()
         {
             if (Server != null)
@@ -68,12 +66,6 @@ public void Start()
             }
         }
 
-        // The user should never need to pump the update loop manually
-        internal void Update()
-        {
-            SyncVarSender?.Update();
-        }
-
         internal void RegisterMessageHandlers(INetworkPlayer player)
         {
             player.RegisterHandler<ReadyMessage>(OnClientReadyMessage);
@@ -87,7 +79,6 @@ void OnAuthenticated(INetworkPlayer player)
 
         void OnServerStarted()
         {
-            SyncVarSender = new SyncVarSender();
             SpawnOrActivate();
         }
 
@@ -101,7 +92,6 @@ void OnServerStopped()
             }
 
             Server.World.ClearSpawnedObjects();
-            SyncVarSender = null;
             // reset so ids stay small in each session
             nextNetworkId = 1;
         }