Ensure OnBalanceCheck and OnBalanceUpdate events are called on main thread

Author: RestoreMonarchy

UconomyXP/DatabaseManager.cs

@@ -1,7 +1,6 @@
-using fr34kyn01535.Uconomy.Models;
+using fr34kyn01535.Uconomy.Helpers;
+using fr34kyn01535.Uconomy.Models;
 using fr34kyn01535.Uconomy.Storage;
-using Rocket.Core.Logging;
-using SDG.Unturned;
 using Steamworks;
 using System;
 using System.Collections.Generic;
@@ -53,7 +52,10 @@ public decimal GetBalance(string id)
 
             decimal balance = bal?.Balance ?? 0;
 
-            pluginInstance.OnBalanceChecked(id, balance);
+            ThreadHelper.RunSynchronously(() =>
+            {
+                pluginInstance.OnBalanceChecked(id, balance);
+            });            
 
             return balance;
         }
@@ -71,7 +73,10 @@ public decimal IncreaseBalance(string id, decimal increaseBy)
 
             bal.SetExperience(new CSteamID(ulong.Parse(id)));
 
-            pluginInstance.BalanceUpdated(id, increaseBy);
+            ThreadHelper.RunSynchronously(() =>
+            {
+                pluginInstance.BalanceUpdated(id, increaseBy);
+            });            
 
             return bal.Experience;
         }

UconomyXP/Helpers/ThreadHelper.cs

@@ -0,0 +1,43 @@
+using Rocket.Core.Logging;
+using Rocket.Core.Utils;
+using SDG.Unturned;
+using System;
+using System.Threading;
+
+namespace fr34kyn01535.Uconomy.Helpers
+{
+    internal static class ThreadHelper
+    {
+        internal static void RunAsynchronously(System.Action action, string exceptionMessage = null)
+        {
+            if (Thread.CurrentThread != ThreadUtil.gameThread)
+            {
+                action.Invoke();
+                return;
+            }
+
+            ThreadPool.QueueUserWorkItem((_) =>
+            {
+                try
+                {
+                    action.Invoke();
+                }
+                catch (Exception e)
+                {
+                    RunSynchronously(() => Logger.LogException(e, exceptionMessage));
+                }
+            });
+        }
+
+        internal static void RunSynchronously(System.Action action, float delaySeconds = 0)
+        {
+            if (Thread.CurrentThread == ThreadUtil.gameThread)
+            {
+                action.Invoke();
+                return;
+            }
+
+            TaskDispatcher.QueueOnMainThread(action, delaySeconds);
+        }
+    }
+}

UconomyXP/UconomyXP.csproj

@@ -5,7 +5,7 @@
 		<LangVersion>latest</LangVersion>
 		<RootNamespace>fr34kyn01535.Uconomy</RootNamespace>
 		<AssemblyName>Uconomy</AssemblyName>
-		<Version>1.1.1</Version>
+		<Version>1.1.2</Version>
 		<AssemblyVersion>1.0.4.1</AssemblyVersion>
 		<AssemblyTitle>Uconomy</AssemblyTitle>
 	</PropertyGroup>