sync paints on plugin reload

Creating tables fix

.github/workflows/build.yml

@@ -28,6 +28,21 @@ jobs:
       run: dotnet restore
     - name: Build
       run: dotnet build ${{ env.PROJECT_PATH }} -c WeaponPaints -o ${{ env.OUTPUT_PATH }}
+
+  publish:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Restore
+      run: dotnet restore
+    - name: Build
+      run: dotnet build ${{ env.PROJECT_PATH }} -c WeaponPaints -o ${{ env.OUTPUT_PATH }}
     - name: Clean files
       run: |
         rm -f \
@@ -57,4 +72,4 @@ jobs:
         name: "Build ${{ env.BUILD_NUMBER }}"
         tag: "build-${{ env.BUILD_NUMBER }}"
         body: |
-          Place the plugin in game/csgo/addons/counterstrikesharp/plugins/WeaponPaints
+          Place the plugin in game/csgo/addons/counterstrikesharp/plugins/WeaponPaints

WeaponPaints.cs

@@ -32,26 +32,16 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     private Dictionary<int, string> g_playersKnife = new();
     private static readonly Dictionary<string, string> knifeTypes = new()
     {
-        { "m9", "weapon_knife_m9_bayonet" },
-        { "karambit", "weapon_knife_karambit" },
-        { "bayonet", "weapon_bayonet" },
-        { "bowie", "weapon_knife_survival_bowie" },
-        { "butterfly", "weapon_knife_butterfly" },
-        { "falchion", "weapon_knife_falchion" },
-        { "flip", "weapon_knife_flip" },
-        { "gut", "weapon_knife_gut" },
-        { "tactical", "weapon_knife_tactical" },
-        { "shadow", "weapon_knife_push" },
-        { "navaja", "weapon_knife_gypsy_jackknife" },
-        { "stiletto", "weapon_knife_stiletto" },
-        { "talon", "weapon_knife_widowmaker" },
-        { "ursus", "weapon_knife_ursus" },
-        { "css", "weapon_knife_css" },
-        { "paracord", "weapon_knife_cord" },
-        { "survival", "weapon_knife_canis" },
-        { "nomad", "weapon_knife_outdoor" },
-        { "skeleton", "weapon_knife_skeleton" },
-        { "default", "weapon_knife" }
+        { "m9", "weapon_knife_m9_bayonet" },        { "karambit", "weapon_knife_karambit" },
+        { "bayonet", "weapon_bayonet" },        { "bowie", "weapon_knife_survival_bowie" },
+        { "butterfly", "weapon_knife_butterfly" },        { "falchion", "weapon_knife_falchion" },
+        { "flip", "weapon_knife_flip" },        { "gut", "weapon_knife_gut" },
+        { "tactical", "weapon_knife_tactical" },        { "shadow", "weapon_knife_push" },
+        { "navaja", "weapon_knife_gypsy_jackknife" },        { "stiletto", "weapon_knife_stiletto" },
+        { "talon", "weapon_knife_widowmaker" },        { "ursus", "weapon_knife_ursus" },
+        { "css", "weapon_knife_css" },        { "paracord", "weapon_knife_cord" },
+        { "survival", "weapon_knife_canis" },        { "nomad", "weapon_knife_outdoor" },
+        { "skeleton", "weapon_knife_skeleton" },        { "default", "weapon_knife" }
     };
     private static readonly List<string> weaponList = new()
     {
@@ -67,7 +57,6 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     };
     public override void Load(bool hotReload)
     {
-		base.Load(hotReload);
         BuildDatabaseConnectionString();
         TestDatabaseConnection();
         SetGlobalExceptionHandler();
@@ -77,11 +66,23 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
         RegisterListener<Listeners.OnMapStart>(OnMapStart);
         RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
-        //RegisterEventHandler<EventRoundPrestart>(OnRoundPreStart);
         if (Config.Additional.KnifeEnabled)
             SetupMenus();
 
         RegisterCommands();
+        if (hotReload)
+        {
+            Task.Run(async () =>
+            {
+                for (int i = 1; i <= Server.MaxPlayers; i++)
+                {
+                    if (Config.Additional.KnifeEnabled)
+                        await GetKnifeFromDatabase(i);
+                    if (Config.Additional.SkinEnabled)
+                        await GetWeaponPaintsFromDatabase(i);
+                }
+            });
+        }
     }
     public void OnConfigParsed(WeaponPaintsConfig config)
     {
@@ -127,29 +128,29 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         CheckDatabaseTables();
     }
 
-    private void CheckDatabaseTables()
+    async private void  CheckDatabaseTables()
     {
         try
         {
-            using var connection = new MySqlConnection(DatabaseConnectionString);
-            connection.OpenAsync();
+		using var connection = new MySqlConnection(DatabaseConnectionString);
+		await connection.OpenAsync();
 
-            using var transaction = connection.BeginTransaction();
+		using var transaction = await connection.BeginTransactionAsync();
 
             try
             {
-                string createTable1 = "CREATE TABLE IF NOT EXISTS `wp_player_skins` (`steamid` varchar(64) NOT NULL, `weapon_defindex` int(6) NOT NULL, `weapon_paint_id` int(6) NOT NULL, `weapon_wear` float NOT NULL DEFAULT 0.0001, `weapon_seed` int(16) NOT NULL DEFAULT 0) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;";
-                string createTable2 = "CREATE TABLE IF NOT EXISTS `wp_player_knife` (`steamid` varchar(64) NOT NULL, `knife` varchar(64) NOT NULL, UNIQUE (`steamid`)) ENGINE = InnoDB;";
+                string createTable1 = "CREATE TABLE IF NOT EXISTS `wp_player_skins` (`steamid` varchar(64) NOT NULL, `weapon_defindex` int(6) NOT NULL, `weapon_paint_id` int(6) NOT NULL, `weapon_wear` float NOT NULL DEFAULT 0.0001, `weapon_seed` int(16) NOT NULL DEFAULT 0) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci";
+                string createTable2 = "CREATE TABLE IF NOT EXISTS `wp_player_knife` (`steamid` varchar(64) NOT NULL, `knife` varchar(64) NOT NULL, UNIQUE (`steamid`)) ENGINE = InnoDB";
 
-                connection.ExecuteAsync(createTable1);
-                connection.ExecuteAsync(createTable2);
+		await connection.ExecuteAsync(createTable1, transaction: transaction);
+		await connection.ExecuteAsync(createTable2, transaction: transaction);
 
-                transaction.Commit();
+		await transaction.CommitAsync();
             }
             catch (Exception)
             {
-                transaction.RollbackAsync();
-                throw new Exception("Unable to create tables!");
+		await transaction.RollbackAsync();
+		throw new Exception("Unable to create tables!");
             }
         }
         catch (Exception ex)
@@ -220,12 +221,12 @@ public override void Unload(bool hotReload)
     private void OnClientDisconnect(int playerSlot)
     {
         CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
-		// TODO: Clean up after player
-		if (Config.Additional.KnifeEnabled)
-            g_playersKnife.Remove(playerSlot+1);
-		if (Config.Additional.SkinEnabled)
-			gPlayerWeaponPaints.Remove(new SteamID(player.SteamID).SteamId64);
-
+	if (!player.IsValid || player.IsBot) return;
+ 
+	if (Config.Additional.KnifeEnabled)
+    		g_playersKnife.Remove(playerSlot+1);
+	if (Config.Additional.SkinEnabled)
+		gPlayerWeaponPaints.Remove(new SteamID(player.SteamID).SteamId64);
 	}
 
 	private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)