fix: fixing null ref in SyncPositionBehaviour

adding extra null checks to stop null check incase order of events is different
James-Frowen · Jun 12, 2023 · 69ba59d · 69ba59d
1 parent 29b67b3
commit 69ba59d
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Assets/NetworkPositionSync/Runtime/SyncPositionBehaviour.cs b/Assets/NetworkPositionSync/Runtime/SyncPositionBehaviour.cs
@@ -299,14 +299,20 @@ public void OnStartServer()
         public void OnStopClient()
         {
             // dont add twice in host mode
-            if (IsServer) return;
-            _system.Behaviours.RemoveBehaviour(this);
+            if (IsServer)
+                return;
+
+            // null check incase IsServer is set to false before OnStopClient is called
+            if (_system != null)
+                _system.Behaviours.RemoveBehaviour(this);
             _system = null;
         }
 
         public void OnStopServer()
         {
-            _system.Behaviours.RemoveBehaviour(this);
+            // null check incase OnStopClient is called first
+            if (_system !=null)
+                _system.Behaviours.RemoveBehaviour(this);
             _system = null;
         }
         #endregion