Fix access to registered game clock from other threads (#7)

Replaces registered game clock with own copy of Time.realtimeSinceStartup
OxideMod · Feb 15, 2019 · 8b48864 · 8b48864
1 parent ad2dfeb
commit 8b48864
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/UnityExtension.cs b/src/UnityExtension.cs
@@ -2,7 +2,6 @@
 using Oxide.Core.Unity.Plugins;
 using System;
 using System.Reflection;
-using UnityEngine;
 
 namespace Oxide.Core.Unity
 {
@@ -51,7 +50,7 @@ public override void Load()
         {
             Manager.RegisterPluginLoader(new UnityPluginLoader());
 
-            Interface.Oxide.RegisterEngineClock(() => Time.realtimeSinceStartup);
+            Interface.Oxide.RegisterEngineClock(() => UnityScript.RealtimeSinceStartup);
 
             // Register our MonoBehaviour
             UnityScript.Create();

diff --git a/src/UnityScript.cs b/src/UnityScript.cs
@@ -10,6 +10,8 @@ namespace Oxide.Core.Unity
     public class UnityScript : MonoBehaviour
     {
         public static GameObject Instance { get; private set; }
+
+        public static float RealtimeSinceStartup { get; private set; }
 
         public static void Create()
         {
@@ -22,6 +24,8 @@ public static void Create()
 
         private void Awake()
         {
+            RealtimeSinceStartup = Time.realtimeSinceStartup;
+
             oxideMod = Interface.Oxide;
 
             EventInfo eventInfo = typeof(Application).GetEvent("logMessageReceived");
@@ -50,7 +54,12 @@ private void Awake()
             }
         }
 
-        private void Update() => oxideMod.OnFrame(Time.deltaTime);
+        private void Update()
+        {
+            RealtimeSinceStartup = Time.realtimeSinceStartup;
+
+            oxideMod.OnFrame(Time.deltaTime);
+        }
 
         private void OnDestroy()
         {