From 175d6df2503325b4a5a044db4c53e6a785a4f50e Mon Sep 17 00:00:00 2001
From: Dawid Bepierszcz <41084667+daffyyyy@users.noreply.github.com>
Date: Fri, 2 Feb 2024 22:57:05 +0100
Subject: [PATCH] 1.2.9a - fix

- Fixed native in non-main thread
---
 CS2-SimpleAdmin.cs | 58 +++++++++++++++++++++++++---------------------
 Database.cs        |  1 +
 Events.cs          |  1 +
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/CS2-SimpleAdmin.cs b/CS2-SimpleAdmin.cs
index c50fe8c..ab33ca1 100644
--- a/CS2-SimpleAdmin.cs
+++ b/CS2-SimpleAdmin.cs
@@ -59,7 +59,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
 		}
 	}
 
-	public async void OnConfigParsed(CS2_SimpleAdminConfig config)
+	public void OnConfigParsed(CS2_SimpleAdminConfig config)
 	{
 		if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)
 		{
@@ -77,16 +77,19 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
 
 		dbConnectionString = builder.ConnectionString;
 
-		try
+		Task.Run(async () =>
 		{
-			_database = new(dbConnectionString);
-
-			using (var connection = _database.GetConnection())
+			try
 			{
-				using var transaction = await connection.BeginTransactionAsync();
-				try
+
+				_database = new(dbConnectionString);
+
+				using (var connection = _database.GetConnection())
 				{
-					string sql = @"CREATE TABLE IF NOT EXISTS `sa_bans` (
+					using var transaction = await connection.BeginTransactionAsync();
+					try
+					{
+						string sql = @"CREATE TABLE IF NOT EXISTS `sa_bans` (
                                 `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
                                 `player_steamid` VARCHAR(64),
                                 `player_name` VARCHAR(128),
@@ -102,9 +105,9 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
                             ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;";
 
 
-					await connection.QueryAsync(sql, transaction: transaction);
+						await connection.QueryAsync(sql, transaction: transaction);
 
-					sql = @"CREATE TABLE IF NOT EXISTS `sa_mutes` (
+						sql = @"CREATE TABLE IF NOT EXISTS `sa_mutes` (
 						 `id` int(11) NOT NULL AUTO_INCREMENT,
 						 `player_steamid` varchar(64) NOT NULL,
 						 `player_name` varchar(128) NULL,
@@ -120,9 +123,9 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
 						 PRIMARY KEY (`id`)
 						) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci";
 
-					await connection.QueryAsync(sql, transaction: transaction);
+						await connection.QueryAsync(sql, transaction: transaction);
 
-					sql = @"CREATE TABLE IF NOT EXISTS `sa_admins` (
+						sql = @"CREATE TABLE IF NOT EXISTS `sa_admins` (
 						 `id` int(11) NOT NULL AUTO_INCREMENT,
 						 `player_steamid` varchar(64) NOT NULL,
 						 `player_name` varchar(128) NOT NULL,
@@ -134,9 +137,9 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
 						 PRIMARY KEY (`id`)
 						) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci";
 
-					await connection.QueryAsync(sql, transaction: transaction);
+						await connection.QueryAsync(sql, transaction: transaction);
 
-					sql = @"CREATE TABLE IF NOT EXISTS `sa_servers` (
+						sql = @"CREATE TABLE IF NOT EXISTS `sa_servers` (
 						 `id` int(11) NOT NULL AUTO_INCREMENT,
 						 `address` varchar(64) NOT NULL,
 						 `hostname` varchar(64) NOT NULL,
@@ -145,22 +148,23 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
 						) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
 						";
 
-					await connection.QueryAsync(sql, transaction: transaction);
+						await connection.QueryAsync(sql, transaction: transaction);
 
-					await transaction.CommitAsync();
-				}
-				catch (Exception)
-				{
-					await transaction.RollbackAsync();
-					throw;
+						await transaction.CommitAsync();
+					}
+					catch (Exception)
+					{
+						await transaction.RollbackAsync();
+						throw;
+					}
 				}
 			}
-		}
-		catch (Exception)
-		{
-			Logger.LogError("Unable to connect to the database!");
-			throw new Exception("[CS2-SimpleAdmin] Unable to connect to the Database!");
-		}
+			catch (Exception)
+			{
+				Logger.LogError("Unable to connect to the database!");
+				throw new Exception("[CS2-SimpleAdmin] Unable to connect to the Database!");
+			}
+		});
 
 		Config = config;
 		_localizer = Localizer;
diff --git a/Database.cs b/Database.cs
index 4111895..16413e1 100644
--- a/Database.cs
+++ b/Database.cs
@@ -1,5 +1,6 @@
 using MySqlConnector;
 
+namespace CS2_SimpleAdmin;
 public class Database
 {
 	private readonly string _dbConnectionString;
diff --git a/Events.cs b/Events.cs
index 02d75d9..24839ca 100644
--- a/Events.cs
+++ b/Events.cs
@@ -4,6 +4,7 @@ using CounterStrikeSharp.API.Modules.Admin;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Cvars;
 using Dapper;
+using Microsoft.Extensions.Logging;
 using System.Data;
 using System.Text;
 using static CounterStrikeSharp.API.Core.Listeners;