Merge pull request #44 from daffyyyy/fix-knives_finally

Finally fixed knife problem?

.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 \

Config.cs

@@ -17,6 +17,8 @@ namespace WeaponPaints
         public string SuccessRefreshCommand { get; set; } = "Refreshing weapon paints.";
         [JsonPropertyName("ChosenKnifeMenu")]
         public string ChosenKnifeMenu { get; set; } = "You have chosen {KNIFE} as your knife.";
+        [JsonPropertyName("ChosenKnifeMenuKill")]
+        public string ChosenKnifeMenuKill { get; set; } = "To correctly apply skin for knife, you need to type !kill.";
         [JsonPropertyName("KnifeMenuTitle")]
         public string KnifeMenuTitle { get; set; } = "Knife Menu.";
     }
@@ -34,11 +36,29 @@ namespace WeaponPaints
 
         [JsonPropertyName("CommandWpEnabled")]
         public bool CommandWpEnabled { get; set; } = true;
+
+        [JsonPropertyName("CommandKillEnabled")]
+        public bool CommandKillEnabled { get; set; } = true;
+        
+        [JsonPropertyName("CommandKnife")]
+        public string CommandKnife { get; set; } = "knife";
+
+        [JsonPropertyName("CommandSkin")]
+        public string CommandSkin { get; set; } = "ws";
+
+        [JsonPropertyName("CommandRefresh")]
+        public string CommandRefresh { get; set; } = "wp";
+
+        [JsonPropertyName("CommandKill")]
+        public string CommandKill { get; set; } = "kill";
+
+        [JsonPropertyName("GiveRandomKnife")]
+        public bool GiveRandomKnife { get; set; } = false;
     }
 
     public class WeaponPaintsConfig : BasePluginConfig
     {
-        public override int Version { get; set; } = 3;
+        public override int Version { get; set; } = 4;
 
         [JsonPropertyName("DatabaseHost")]
         public string DatabaseHost { get; set; } = "";

WeaponPaints.cs

@@ -7,24 +7,26 @@ using CounterStrikeSharp.API.Modules.Entities;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Menu;
 using CounterStrikeSharp.API.Modules.Utils;
-using Nexd.MySQL;
+using MySqlConnector;
+using Dapper;
 using System.Runtime.ExceptionServices;
-using static CounterStrikeSharp.API.Core.Listeners;
 using System.Reflection;
-
+using CounterStrikeSharp.API.Modules.Cvars;
 
 namespace WeaponPaints;
-[MinimumApiVersion(52)]
+[MinimumApiVersion(55)]
 public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
     public override string ModuleName => "WeaponPaints";
-    public override string ModuleDescription => "Connector for web-based player chosen wepaon paints.";
+    public override string ModuleDescription => "Connector for web-based player chosen wepaon paints, and standalone for knife.";
     public override string ModuleAuthor => "Nereziel";
-    public override string ModuleVersion => "0.8";
-
+    public override string ModuleVersion => "0.9";
     public WeaponPaintsConfig Config { get; set; } = new();
 
-    MySqlDb? MySql = null;
+    private string DatabaseConnectionString = string.Empty;
+
+	public bool IsMatchZy = false;
+
 	private DateTime[] commandCooldown = new DateTime[Server.MaxPlayers];
     private Dictionary<ulong, Dictionary<nint, int>> gPlayerWeaponPaints = new();
     private Dictionary<ulong, Dictionary<nint, int>> gPlayerWeaponSeed = new();
@@ -32,26 +34,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,17 +59,36 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     };
     public override void Load(bool hotReload)
     {
-        base.Load(hotReload);
         SetGlobalExceptionHandler();
-        MySql = new MySqlDb(Config.DatabaseHost, Config.DatabaseUser, Config.DatabasePassword, Config.DatabaseName!, Config.DatabasePort);
+        BuildDatabaseConnectionString();
+        TestDatabaseConnection();
         RegisterListener<Listeners.OnEntitySpawned>(OnEntitySpawned);
         RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
         RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
         RegisterListener<Listeners.OnMapStart>(OnMapStart);
         RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
-        //RegisterEventHandler<EventRoundPrestart>(OnRoundPreStart);
+		RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
+		RegisterEventHandler<EventItemPickup>(OnItemPickup, HookMode.Pre);
+
+		if (hotReload)
+		{
+			OnMapStart(string.Empty);
+			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);
+				}
+			});
+		}
+
 		if (Config.Additional.KnifeEnabled)
             SetupMenus();
+
+        RegisterCommands();
     }
     public void OnConfigParsed(WeaponPaintsConfig config)
     {
@@ -88,6 +99,70 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 
         Config = config;
     }
+
+    private void BuildDatabaseConnectionString()
+    {
+        var builder = new MySqlConnectionStringBuilder
+        {
+            Server = Config.DatabaseHost,
+            UserID = Config.DatabaseUser,
+            Password = Config.DatabasePassword,
+            Database = Config.DatabaseName,
+            Port = (uint)Config.DatabasePort,
+        };
+
+        DatabaseConnectionString = builder.ConnectionString;
+    }
+
+    private void TestDatabaseConnection()
+    {
+        try
+        {
+            using var connection = new MySqlConnection(DatabaseConnectionString);
+            connection.Open();
+
+            if (connection.State != System.Data.ConnectionState.Open)
+            {
+                throw new Exception("Unable connect to database!");
+            }
+        }
+        catch (Exception ex)
+        {
+            throw new Exception("Unknown mysql exception! " + ex.Message);
+        }
+        CheckDatabaseTables();
+    }
+
+    async private void  CheckDatabaseTables()
+    {
+        try
+        {
+			using var connection = new MySqlConnection(DatabaseConnectionString);
+			await connection.OpenAsync();
+
+			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";
+
+				await connection.ExecuteAsync(createTable1, transaction: transaction);
+				await connection.ExecuteAsync(createTable2, transaction: transaction);
+
+				await transaction.CommitAsync();
+            }
+            catch (Exception)
+            {
+				await transaction.RollbackAsync();
+				throw new Exception("Unable to create tables!");
+            }
+        }
+        catch (Exception ex)
+        {
+            throw new Exception("Unknown mysql exception! " + ex.Message);
+        }
+    }
 // TODO: fix for map which change mp_t_default_melee
 /*private HookResult OnRoundPreStart(EventRoundPrestart @event, GameEventInfo info)
 {
@@ -113,14 +188,38 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     {
         AppDomain.CurrentDomain.FirstChanceException -= this.GlobalExceptionHandler;
     }
+    private void RegisterCommands()
+    {
+        AddCommand($"css_{Config.Additional.CommandSkin}", "Skins info", (player, info) => { if (player == null) return; OnCommandWS(player, info); });
+        AddCommand($"css_{Config.Additional.CommandRefresh}", "Skins refresh", (player, info) => { if (player == null) return; OnCommandRefresh(player, info); });
+        if (Config.Additional.CommandKillEnabled) {
+            AddCommand($"css_{Config.Additional.CommandKill}", "kill yourself", (player, info) => {
+                if(player == null || !player.IsValid || !player.PlayerPawn.IsValid)
+                    return;
+
+                player.PlayerPawn.Value.CommitSuicide(true, false);
+            });
+        }
+    }
+	private void IncompatibilityCheck()
+	{
+		// MatchZy
+		if (Directory.Exists(Path.GetDirectoryName(ModuleDirectory) + "/MatchZy"))
+		{
+			Console.WriteLine("[WeaponPaints] Incompatibility found: MatchZy");
+			IsMatchZy = true;
+		}
+	}
+
 	private void OnMapStart(string mapName)
     {
         if (!Config.Additional.KnifeEnabled) return;
         // TODO
         // needed for now
-        base.AddTimer(2.0f, () => {
+		AddTimer(2.0f, () => { 
             NativeAPI.IssueServerCommand("mp_t_default_melee \"\""); 
             NativeAPI.IssueServerCommand("mp_ct_default_melee \"\""); 
+            IncompatibilityCheck();
 		});
 	}
 
@@ -131,14 +230,19 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         {   
             if (Config.Additional.KnifeEnabled)
                 await GetKnifeFromDatabase(playerIndex);
+            if (Config.Additional.SkinEnabled)
                 await GetWeaponPaintsFromDatabase(playerIndex);
         });
     }
     private void OnClientDisconnect(int playerSlot)
     {
+        CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
+		if (!player.IsValid || player.IsBot) return;
 		// TODO: Clean up after player
 		if (Config.Additional.KnifeEnabled)
-            g_playersKnife.Remove(playerSlot+1);
+            g_playersKnife.Remove((int)player.EntityIndex!.Value.Value);
+		if (Config.Additional.SkinEnabled)
+			gPlayerWeaponPaints.Remove(new SteamID(player.SteamID).SteamId64);
 	}
 
 	private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
@@ -149,19 +253,38 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             return HookResult.Continue;
         }
 
-        if (Config.Additional.KnifeEnabled)
+         if (Config.Additional.KnifeEnabled) {
 			GiveKnifeToPlayer(player);
-
-        if (Config.Additional.SkinVisibilityFix)
-        {
-            // Check the best slot and set it. Weird solution but works xD
-            AddTimer(0.1f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3"));
-            AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
-            AddTimer(0.35f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
 		}
 
         return HookResult.Continue;
     }
+	private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
+	{
+        if (!IsMatchZy) return HookResult.Continue;
+
+		NativeAPI.IssueServerCommand("mp_t_default_melee \"\"");
+		NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
+
+		return HookResult.Continue;
+	}
+	private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
+    {
+        if (@event.Defindex == 42 || @event.Defindex == 59)
+        {
+            CCSPlayerController player = @event.Userid;
+
+            if (player.IsValid && !player.IsBot && @event.Item == "knife")
+            {
+                if (g_playersKnife.ContainsKey((int)player.EntityIndex!.Value.Value) 
+                    &&
+                   g_playersKnife[(int)player.EntityIndex!.Value.Value] != "weapon_knife")
+                    RefreshPlayerKnife(player, true);
+            }
+        }
+		return HookResult.Continue;
+	}
+
 	private void OnEntitySpawned(CEntityInstance entity)
     {
         if (!Config.Additional.SkinEnabled) return;
@@ -176,6 +299,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         }
         Server.NextFrame(() =>
         {
+            try {
                 if (!weapon.IsValid) return;
                 if (weapon.OwnerEntity.Value == null) return;
                 if (!weapon.OwnerEntity.Value.EntityIndex.HasValue) return;
@@ -206,33 +330,35 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
                     var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
                     skeleton.ModelState.MeshGroupMask = 2;
                 }
+                } catch(Exception) {}
             });
     }
-    public void GiveKnifeToPlayer(CCSPlayerController player)
+    public void GiveKnifeToPlayer(CCSPlayerController? player)
     {
         if (!Config.Additional.KnifeEnabled) return;
-        if (player.IsBot) 
-        { 
-            player.GiveNamedItem((CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife");
-            return;
-        }
+		if (player == null || !player.IsValid) return;
 
-        if (!PlayerHasKnife(player))
-        {
 		if (g_playersKnife.TryGetValue((int)player.EntityIndex!.Value.Value, out var knife))
         {
             player.GiveNamedItem(knife);
         }
         else
+        {
+            if (Config.Additional.GiveRandomKnife)
+            {
+                Random random = new Random();
+                int index = random.Next(knifeTypes.Count);
+                player.GiveNamedItem(knifeTypes.Values.ElementAt(index));
+            }
+            else
             {
                 player.GiveNamedItem((CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife");
             }
         }
     }
-    public void RemoveKnifeFromPlayer(CCSPlayerController player)
+    public void RemoveKnifeFromPlayer(CCSPlayerController? player)
     {
-        if (!Config.Additional.KnifeEnabled) return;
-        if (!g_playersKnife.ContainsKey((int)player.EntityIndex!.Value.Value)) return;
+		if (player == null || !player.IsValid || !player.PawnIsAlive) return;
 		var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;
         foreach (var weapon in weapons)
         {
@@ -242,15 +368,41 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
                 if (weapon.Value.DesignerName.Contains("knife"))
                 {
                     weapon.Value.Remove();
-                    break;
+                    return;
                 }
             }
         }
     }
-    public bool PlayerHasKnife(CCSPlayerController player)
+	public void RefreshPlayerKnife(CCSPlayerController? player, bool remove = false)
 	{
-        if (!Config.Additional.KnifeEnabled) return true;
+		if (player == null || !player.IsValid || !player.PawnIsAlive) return;
+
+		if (remove == true)
+			RemoveKnifeFromPlayer(player);
+
+        AddTimer(0.1f, () => {
+			if (!PlayerHasKnife(player))
+				GiveKnifeToPlayer(player);
+		});
+
+		if (Config.Additional.SkinVisibilityFix)
+		{
+			AddTimer(0.2f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3"));
+			AddTimer(0.32f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
+			AddTimer(0.42f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
+		}
+	}
+	public bool PlayerHasKnife(CCSPlayerController? player)
+    {
+        if (!Config.Additional.KnifeEnabled) return false;
+
+        if (player == null || !player.IsValid || !player.PawnIsAlive)
+        {
+            return false;
+        }
+
         var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;
+        if (weapons == null) return false;
         foreach (var weapon in weapons)
         {
             if (weapon.IsValid && weapon.Value.IsValid)
@@ -269,25 +421,30 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         var giveItemMenu = new ChatMenu(ReplaceTags(Config.Messages.KnifeMenuTitle));
         var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
         {
+            string temp = "";
             if (knifeTypes.TryGetValue(option.Text, out var knife))
             {
-                Task.Run(() => SyncKnifeToDatabase((int)player.EntityIndex!.Value.Value, knife));
                 g_playersKnife[(int)player.EntityIndex!.Value.Value] = knifeTypes[option.Text];
                 if (!string.IsNullOrEmpty(Config.Messages.ChosenKnifeMenu)) {
-                    string temp = $"{Config.Prefix} {Config.Messages.ChosenKnifeMenu}".Replace("{KNIFE}", option.Text);
+                    temp = $"{Config.Prefix} {Config.Messages.ChosenKnifeMenu}".Replace("{KNIFE}", option.Text);
                     player.PrintToChat(ReplaceTags(temp));
                 }
+                if (!string.IsNullOrEmpty(Config.Messages.ChosenKnifeMenuKill) && Config.Additional.CommandKillEnabled) {
+                    temp = $"{Config.Prefix} {Config.Messages.ChosenKnifeMenuKill}";
+                    player.PrintToChat(ReplaceTags(temp));
+                }
+                Task.Run(() => SyncKnifeToDatabase((int)player.EntityIndex!.Value.Value, knife));
                 RemoveKnifeFromPlayer(player);
-                GiveKnifeToPlayer(player);
+                AddTimer(0.1f, () => GiveKnifeToPlayer(player));
             }
         };
         foreach (var knife in knifeTypes)
         {
             giveItemMenu.AddMenuOption(knife.Key, handleGive);
         }
-        AddCommand("css_knife", "Knife Menu", (player, info) => { if (player == null) return; ChatMenus.OpenMenu(player, giveItemMenu); });
+        AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) => { if (player == null) return; ChatMenus.OpenMenu(player, giveItemMenu); });
     }
-    [ConsoleCommand("css_wp", "refreshskins")]
+    // [ConsoleCommand($"css_{Config.Additional.CommandRefresh}", "refreshskins")]
     public void OnCommandRefresh(CCSPlayerController? player, CommandInfo command)
     {
         if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled) return;
@@ -299,7 +456,11 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             commandCooldown[playerIndex] = DateTime.UtcNow;
             Task.Run(async () => await GetWeaponPaintsFromDatabase(playerIndex));
             if (Config.Additional.KnifeEnabled)
+            {
 				Task.Run(async () => await GetKnifeFromDatabase(playerIndex));
+                RemoveKnifeFromPlayer(player);
+				AddTimer(0.3f, () => GiveKnifeToPlayer(player));
+			}
             if (!string.IsNullOrEmpty(Config.Messages.SuccessRefreshCommand)) {
                 temp = $"{Config.Prefix} {Config.Messages.SuccessRefreshCommand}";
                 player.PrintToChat(ReplaceTags(temp));
@@ -311,7 +472,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             player.PrintToChat(ReplaceTags(temp));
         }
     }
-    [ConsoleCommand("css_ws", "weaponskins")]
+    // [ConsoleCommand($"css_{Config.Additional.CommandSkin}", "weaponskins")]
     public void OnCommandWS(CCSPlayerController? player, CommandInfo command)
     {
         if (!Config.Additional.SkinEnabled) return;
@@ -344,39 +505,41 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         try
         {
             CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
-            if (player == null || !player.IsValid) return;
+            if (player == null || !player.IsValid || player.IsBot) return;
             var steamId = new SteamID(player.SteamID);
 
-            MySqlQueryCondition conditions = new MySqlQueryCondition()
-                 .Add("steamid", "=", steamId.SteamId64.ToString());
-
-            MySqlQueryResult result = await MySql!.Table("wp_player_skins").Where(conditions).SelectAsync();
-            if (result.Rows < 1) return;
-            result.ToList().ForEach(pair =>
+            using (var connection = new MySqlConnection(DatabaseConnectionString))
             {
-                int WeaponDefIndex = result.Get<int>(pair.Key, "weapon_defindex");
-                int PaintId = result.Get<int>(pair.Key, "weapon_paint_id");
-                float Wear = result.Get<float>(pair.Key, "weapon_wear");
-                int Seed = result.Get<int>(pair.Key, "weapon_seed");
+                await connection.OpenAsync();
 
-                if (!gPlayerWeaponPaints.ContainsKey(steamId.SteamId64))
+                string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
+
+                IEnumerable<dynamic> PlayerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = steamId.SteamId64.ToString() });
+
+				if (PlayerSkins != null && PlayerSkins.AsList().Count > 0)
                 {
 					gPlayerWeaponPaints[steamId.SteamId64] = new Dictionary<nint, int>();
-                }
-                if (!gPlayerWeaponWear.ContainsKey(steamId.SteamId64))
-                {
 					gPlayerWeaponWear[steamId.SteamId64] = new Dictionary<nint, float>();
-                }
-                if (!gPlayerWeaponSeed.ContainsKey(steamId.SteamId64))
-                {
 					gPlayerWeaponSeed[steamId.SteamId64] = new Dictionary<nint, int>();
-                }
 
-                gPlayerWeaponPaints[steamId.SteamId64][WeaponDefIndex] = PaintId;
-                gPlayerWeaponWear[steamId.SteamId64][WeaponDefIndex] = Wear;
-                gPlayerWeaponSeed[steamId.SteamId64][WeaponDefIndex] = Seed;
+					PlayerSkins.ToList().ForEach(row =>
+                    {
+						int weaponDefIndex = row.weapon_defindex ?? default(int);
+						int weaponPaintId = row.weapon_paint_id ?? default(int);
+						float weaponWear = row.weapon_wear ?? default(float);
+						int weaponSeed = row.weapon_seed ?? default(int);
+
+						gPlayerWeaponPaints[steamId.SteamId64][weaponDefIndex] = weaponPaintId;
+						gPlayerWeaponWear[steamId.SteamId64][weaponDefIndex] = weaponWear;
+						gPlayerWeaponSeed[steamId.SteamId64][weaponDefIndex] = weaponSeed;
 					});
                 }
+                else
+                {
+                    return;
+                }
+            }
+        }
         catch (Exception e)
         {
             Log(e.Message);
@@ -389,23 +552,23 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         try
         {
             CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
-            if (player == null || !player.IsValid) return;
+            if (player == null || !player.IsValid || player.IsBot) return;
             var steamId = new SteamID(player.SteamID);
-            MySqlQueryCondition conditions = new MySqlQueryCondition()
-                 .Add("steamid", "=", steamId.SteamId64.ToString());
 
-            MySqlQueryResult result = await MySql!.Table("wp_player_knife").Where(conditions).SelectAsync();
-
-            if (result.Rows < 1)
+            using (var connection = new MySqlConnection(DatabaseConnectionString))
+            {
+                await connection.OpenAsync();
+                string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
+                string? PlayerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = steamId.SteamId64.ToString() });
+
+                if (PlayerKnife != null)
+                {
+					g_playersKnife[playerIndex] = PlayerKnife;
+				}
+                else
                 {
-                //g_playersKnife[playerIndex] = "weapon_knife";
                     return;
                 }
-
-            string knife = result.Get<string>(0, "knife");
-            if (knife != null)
-            {
-                g_playersKnife[playerIndex] = knife;
             }
             //Log($"{player.PlayerName} has this knife -> {g_playersKnife[playerIndex]}");
         }
@@ -423,7 +586,11 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
             if (player == null || !player.IsValid) return;
             var steamId = new SteamID(player.SteamID);
-            await MySql!.ExecuteNonQueryAsync($"INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES('{steamId.SteamId64}', '{knife}') ON DUPLICATE KEY UPDATE `knife` = '{knife}';");
+
+			using var connection = new MySqlConnection(DatabaseConnectionString);
+			await connection.OpenAsync();
+			string query = "INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(@steamid, @newKnife) ON DUPLICATE KEY UPDATE `knife` = @newKnife";
+			await connection.ExecuteAsync(query, new { steamid = steamId.SteamId64.ToString(), newKnife = knife });
         }
         catch (Exception e)
         {

WeaponPaints.csproj

@@ -9,7 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="CounterStrikeSharp.API" Version="*" />
-    <PackageReference Include="Nexd.MySQL" Version="1.0.1" />
+    <PackageReference Include="Dapper" Version="2.1.21" />
+    <PackageReference Include="MySqlConnector" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

website/database.sql

@@ -1,46 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 5.2.1
--- https://www.phpmyadmin.net/
---
--- Host: localhost
--- Generation Time: Nov 02, 2023 at 11:12 AM
--- Server version: 10.11.2-MariaDB
--- PHP Version: 8.2.3
-
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-START TRANSACTION;
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-
---
--- Database: `cs2server`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `wp_player_skins`
---
-
-CREATE TABLE `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;
-
---
--- Table structure for table `wp_player_knife`
---
-
-CREATE TABLE `wp_player_knife` (
-  `steamid` varchar(64) NOT NULL,
-  `knife` varchar(64) NOT NULL,
-  UNIQUE (`steamid`)
-) ENGINE = InnoDB;