Merge pull request #174 from daffyyyy/main

1.9c

Commands.cs

@@ -1,8 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Menu;
-using Newtonsoft.Json.Linq;
-using System.Text;
 
 namespace WeaponPaints
 {
@@ -14,14 +12,17 @@ namespace WeaponPaints
 			if (!Utility.IsPlayerValid(player)) return;
 
 			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
-            PlayerInfo playerInfo = new (
+
-                (int)player.Index,
+			PlayerInfo playerInfo = new PlayerInfo
-                player.Slot,
+			{
-                player.UserId,
+				UserId = player.UserId,
-                player.SteamID.ToString(),
+				Slot = player.Slot,
-                player.PlayerName,
+				Index = (int)player.Index,
-                player.IpAddress?.Split(":")[0]
+				SteamId = player?.SteamID.ToString(),
-            );
+				Name = player?.PlayerName,
+				IpAddress = player?.IpAddress?.Split(":")[0]
+			};
+
 			try
 			{
 				if (player != null && !commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
@@ -128,44 +129,18 @@ namespace WeaponPaints
 		{
 			if (!Config.Additional.KnifeEnabled || !g_bCommandsAllowed) return;
 
-            var knivesOnly = GetKnivesOnly();
+			var knivesOnly = weaponList
-            var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
-
-            AddMenuOptions(giveItemMenu, knivesOnly);
-            AddCommandToOpenKnifeMenu(giveItemMenu);
-        }
-
-        private Dictionary<string, string> GetKnivesOnly()
-        {
-            return weaponList
 				.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
 				.ToDictionary(pair => pair.Key, pair => pair.Value);
-        }
 
-        private void AddMenuOptions(ChatMenu giveItemMenu, Dictionary<string, string> knivesOnly)
+			var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
-        {
+			var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
-            foreach (var knifePair in knivesOnly)
-            {
-                giveItemMenu.AddMenuOption(knifePair.Value, (player, option) => HandleGiveOption(player, option, knivesOnly));
-            }
-        }
-
-        private void HandleGiveOption(CCSPlayerController player, ChatMenuOption option, Dictionary<string, string> knivesOnly)
 			{
 				if (!Utility.IsPlayerValid(player)) return;
 
 				var knifeName = option.Text;
 				var knifeKey = knivesOnly.FirstOrDefault(x => x.Value == knifeName).Key;
-
 				if (!string.IsNullOrEmpty(knifeKey))
-            {
-                PrintMessages(player, knifeName);
-                SetPlayerKnife(player, knifeKey);
-                SyncKnifeToDatabase(player, knifeKey);
-            }
-        }
-
-        private void PrintMessages(CCSPlayerController player, string knifeName)
 				{
 					if (!string.IsNullOrEmpty(Localizer["wp_knife_menu_select"]))
 					{
@@ -176,25 +151,8 @@ namespace WeaponPaints
 					{
 						player!.Print(Localizer["wp_knife_menu_kill"]);
 					}
-        }
 
-        private void SetPlayerKnife(CCSPlayerController player, string knifeKey)
+					PlayerInfo playerInfo = new PlayerInfo
-        {
-            g_playersKnife[player.Slot] = knifeKey;
-
-            if (g_bCommandsAllowed && (LifeState_t)player.LifeState == LifeState_t.LIFE_ALIVE)
-                RefreshWeapons(player);
-        }
-
-        private void SyncKnifeToDatabase(CCSPlayerController player, string knifeKey)
-        {
-            if (weaponSync != null)
-                Task.Run(async () => await weaponSync.SyncKnifeToDatabase(GetPlayerInfo(player), knifeKey));
-        }
-
-        private PlayerInfo GetPlayerInfo(CCSPlayerController player)
-        {
-            return new PlayerInfo
 					{
 						UserId = player.UserId,
 						Slot = player.Slot,
@@ -203,17 +161,28 @@ namespace WeaponPaints
 						Name = player.PlayerName,
 						IpAddress = player.IpAddress?.Split(":")[0]
 					};
-        }
 
-        private void AddCommandToOpenKnifeMenu(ChatMenu giveItemMenu)
+					g_playersKnife[player.Slot] = knifeKey;
+
+					if (g_bCommandsAllowed && (LifeState_t)player.LifeState == LifeState_t.LIFE_ALIVE)
+						RefreshWeapons(player);
+
+					if (weaponSync != null)
+						Task.Run(async () => await weaponSync.SyncKnifeToDatabase(playerInfo, knifeKey));
+				}
+			};
+			foreach (var knifePair in knivesOnly)
 			{
+				giveItemMenu.AddMenuOption(knifePair.Value, handleGive);
+			}
 			AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
 
 				if (player == null || player.UserId == null) return;
 
-                if (IsCommandAllowed(player))
+				if (player != null && !commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
+	player != null && DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
 					commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
 					giveItemMenu.PostSelectAction = PostSelectAction.Close;
@@ -227,32 +196,13 @@ namespace WeaponPaints
 			});
 		}
 
-        private bool IsCommandAllowed(CCSPlayerController player)
-        {
-            if (!commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime))
-            {
-                return true;
-            }
-            return DateTime.UtcNow >= cooldownEndTime;
-        }
-
 		private void SetupSkinsMenu()
 		{
 			var classNamesByWeapon = weaponList.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
 			var weaponSelectionMenu = new ChatMenu(Localizer["wp_skin_menu_weapon_title"]);
 
-            // Add weapon options to the weapon selection menu
+			// Function to handle skin selection for a specific weapon
-            foreach (var weaponClass in weaponList.Keys)
+			var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
-            {
-                string weaponName = weaponList[weaponClass];
-                weaponSelectionMenu.AddMenuOption(weaponName, (player, option) => HandleWeaponSelection(player, option, classNamesByWeapon));
-            }
-
-            // Command to open the weapon selection menu for players
-            AddCommand($"css_{Config.Additional.CommandSkinSelection}", "Skins selection menu", (player, info) => OpenWeaponSelectionMenu(player, weaponSelectionMenu));
-        }
-
-        private void HandleWeaponSelection(CCSPlayerController? player, ChatMenuOption option, Dictionary<string, string> classNamesByWeapon)
 			{
 				if (!Utility.IsPlayerValid(player)) return;
 
@@ -269,35 +219,13 @@ namespace WeaponPaints
 					var skinSubMenu = new ChatMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
 					skinSubMenu.PostSelectAction = PostSelectAction.Close;
 
-                // Add skin options to the submenu for the selected weapon
+					// Function to handle skin selection for the chosen weapon
-                if (skinsForSelectedWeapon != null)
+					var handleSkinSelection = (CCSPlayerController p, ChatMenuOption opt) =>
-                {
-                    foreach (var skin in skinsForSelectedWeapon.Where(s => s != null))
-                    {
-                        if (skin.TryGetValue("paint_name", out var paintNameObj) && skin.TryGetValue("paint", out var paintObj))
-                        {
-                            var paintName = paintNameObj?.ToString();
-                            var paint = paintObj?.ToString();
-
-                            if (!string.IsNullOrEmpty(paintName) && !string.IsNullOrEmpty(paint))
-                            {
-                                var optionText = new StringBuilder(paintName).Append(" (").Append(paint).Append(")").ToString();
-                                skinSubMenu.AddMenuOption(optionText, (p, opt) => HandleSkinSelection(p, opt, selectedWeaponClassname));
-                            }
-                        }
-                    }
-                }
-                if (player != null && Utility.IsPlayerValid(player))
-                    MenuManager.OpenChatMenu(player, skinSubMenu);
-            }
-        }
-
-        private void HandleSkinSelection(CCSPlayerController p, ChatMenuOption opt, string selectedWeaponClassname)
 					{
 						if (!Utility.IsPlayerValid(p)) return;
 
 						string steamId = p.SteamID.ToString();
-            var firstSkin = skinsList?.Find(skin =>
+						var firstSkin = skinsList?.FirstOrDefault(skin =>
 						{
 							if (skin != null && skin.TryGetValue("weapon_name", out var weaponName))
 							{
@@ -314,14 +242,6 @@ namespace WeaponPaints
 							weaponDefIndexObj != null &&
 							int.TryParse(weaponDefIndexObj.ToString(), out var weaponDefIndex) &&
 							int.TryParse(selectedPaintID, out var paintID))
-            {
-                HandleSkinImage(p, weaponDefIndex, paintID);
-                p.Print(Localizer["wp_skin_menu_select", selectedSkin]);
-                UpdatePlayerWeaponInfo(p, weaponDefIndex, paintID);
-            }
-        }
-
-        private void HandleSkinImage(CCSPlayerController p, int weaponDefIndex, int paintID)
 						{
 							if (Config.Additional.ShowSkinImage && skinsList != null)
 							{
@@ -334,27 +254,64 @@ namespace WeaponPaints
 								PlayerWeaponImage[p.Slot] = image;
 								AddTimer(2.0f, () => PlayerWeaponImage.Remove(p.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
 							}
+
+							p.Print(Localizer["wp_skin_menu_select", selectedSkin]);
+
+							if (!gPlayerWeaponsInfo[p.Slot].ContainsKey(weaponDefIndex))
+							{
+								gPlayerWeaponsInfo[p.Slot][weaponDefIndex] = new WeaponInfo();
 							}
 
-        private void UpdatePlayerWeaponInfo(CCSPlayerController p, int weaponDefIndex, int paintID)
+							gPlayerWeaponsInfo[p.Slot][weaponDefIndex].Paint = paintID;
-        {
+							gPlayerWeaponsInfo[p.Slot][weaponDefIndex].Wear = 0.00f;
-            if (!gPlayerWeaponsInfo[p.Slot].TryGetValue(weaponDefIndex, out WeaponInfo? value))
+							gPlayerWeaponsInfo[p.Slot][weaponDefIndex].Seed = 0;
-            {
-                value = new WeaponInfo();
-                gPlayerWeaponsInfo[p.Slot][weaponDefIndex] = value;
-            }
 
-            value.Paint = paintID;
+							PlayerInfo playerInfo = new PlayerInfo
-            value.Wear = 0.00f;
+							{
-            value.Seed = 0;
+								UserId = p.UserId,
+								Index = (int)p.Index,
+								SteamId = p.SteamID.ToString(),
+								Name = p.PlayerName,
+								IpAddress = p.IpAddress?.Split(":")[0]
+							};
 
 							if (g_bCommandsAllowed && (LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE)
 							{
-                RefreshWeapons(p);
+								RefreshWeapons(player);
 							}
 						}
+					};
 
-        private void OpenWeaponSelectionMenu(CCSPlayerController? player, ChatMenu weaponSelectionMenu)
+					// Add skin options to the submenu for the selected weapon
+					if (skinsForSelectedWeapon != null)
+					{
+						foreach (var skin in skinsForSelectedWeapon.Where(s => s != null))
+						{
+							if (skin.TryGetValue("paint_name", out var paintNameObj) && skin.TryGetValue("paint", out var paintObj))
+							{
+								var paintName = paintNameObj?.ToString();
+								var paint = paintObj?.ToString();
+
+								if (!string.IsNullOrEmpty(paintName) && !string.IsNullOrEmpty(paint))
+								{
+									skinSubMenu.AddMenuOption($"{paintName} ({paint})", handleSkinSelection);
+								}
+							}
+						}
+					}
+					if (player != null && Utility.IsPlayerValid(player))
+						MenuManager.OpenChatMenu(player, skinSubMenu);
+				}
+			};
+
+			// Add weapon options to the weapon selection menu
+			foreach (var weaponClass in weaponList.Keys)
+			{
+				string weaponName = weaponList[weaponClass];
+				weaponSelectionMenu.AddMenuOption(weaponName, handleWeaponSelection);
+			}
+			// Command to open the weapon selection menu for players
+			AddCommand($"css_{Config.Additional.CommandSkinSelection}", "Skins selection menu", (player, info) =>
 					{
 						if (!Utility.IsPlayerValid(player)) return;
 
@@ -371,7 +328,9 @@ namespace WeaponPaints
 						{
 							player!.Print(Localizer["wp_command_cooldown"]);
 						}
+					});
 		}
+
 		private void SetupGlovesMenu()
 		{
 			var glovesSelectionMenu = new ChatMenu(Localizer["wp_glove_menu_title"]);
@@ -382,24 +341,17 @@ namespace WeaponPaints
 				if (!Utility.IsPlayerValid(player) || player is null) return;
 
 				string selectedPaintName = option.Text;
+
 				var selectedGlove = glovesList.FirstOrDefault(g => g.ContainsKey("paint_name") && g["paint_name"]?.ToString() == selectedPaintName);
 				if (selectedGlove != null)
 				{
-                    HandleSelectedGlove(player, selectedGlove, selectedPaintName);
+					if (
-                }
+						selectedGlove != null &&
-            };
-
-            AddGloveOptionsToMenu(glovesSelectionMenu, handleGloveSelection);
-            AddCommandToOpenGloveSelectionMenu(glovesSelectionMenu);
-        }
-        
-void HandleSelectedGlove(CCSPlayerController? player, JObject selectedGlove, string selectedPaintName)
-        {
-            if (selectedGlove != null &&
 						selectedGlove.ContainsKey("weapon_defindex") &&
 						selectedGlove.ContainsKey("paint") &&
 						int.TryParse(selectedGlove["weapon_defindex"]?.ToString(), out int weaponDefindex) &&
-                int.TryParse(selectedGlove["paint"]?.ToString(), out int paint))
+						int.TryParse(selectedGlove["paint"]?.ToString(), out int paint)
+					)
 					{
 						if (Config.Additional.ShowSkinImage)
 						{
@@ -407,20 +359,22 @@ void HandleSelectedGlove(CCSPlayerController? player, JObject selectedGlove, str
 							PlayerWeaponImage[player.Slot] = image;
 							AddTimer(2.0f, () => PlayerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
 						}
-                PlayerInfo playerInfo = new(
+
-                    (int)player.Index,
+						PlayerInfo playerInfo = new PlayerInfo
-                    player.Slot,
+						{
-                    player.UserId,
+							UserId = player.UserId,
-                    player.SteamID.ToString(),
+							Slot = player.Slot,
-                    player.PlayerName,
+							Index = (int)player.Index,
-                    player.IpAddress?.Split(":")[0]
+							SteamId = player.SteamID.ToString(),
-                );
+							Name = player.PlayerName,
+							IpAddress = player.IpAddress?.Split(":")[0]
+						};
 
 						if (paint != 0)
 						{
 							g_playersGlove[player.Slot] = (ushort)weaponDefindex;
 
-                    if (!gPlayerWeaponsInfo[player.Slot].TryGetValue(weaponDefindex, out _))
+							if (!gPlayerWeaponsInfo[player.Slot].ContainsKey(weaponDefindex))
 							{
 								WeaponInfo weaponInfo = new();
 								weaponInfo.Paint = paint;
@@ -443,24 +397,22 @@ void HandleSelectedGlove(CCSPlayerController? player, JObject selectedGlove, str
 							{
 								await weaponSync.SyncGloveToDatabase(playerInfo, weaponDefindex);
 
-                        if (!gPlayerWeaponsInfo[playerInfo.Slot].TryGetValue(weaponDefindex, out var weaponInfo))
+								if (!gPlayerWeaponsInfo[playerInfo.Slot].ContainsKey(weaponDefindex))
 								{
-                            weaponInfo = new WeaponInfo();
+									gPlayerWeaponsInfo[playerInfo.Slot][weaponDefindex] = new WeaponInfo();
-                            gPlayerWeaponsInfo[playerInfo.Slot][weaponDefindex] = weaponInfo;
 								}
 
-                        weaponInfo.Paint = paint;
+								gPlayerWeaponsInfo[playerInfo.Slot][weaponDefindex].Paint = paint;
-                        weaponInfo.Wear = 0.00f;
+								gPlayerWeaponsInfo[playerInfo.Slot][weaponDefindex].Wear = 0.00f;
-                        weaponInfo.Seed = 0;
+								gPlayerWeaponsInfo[playerInfo.Slot][weaponDefindex].Seed = 0;
-
 							});
 						}
 						RefreshGloves(player);
 					}
-        }
+				};
+			};
 
-        private void AddGloveOptionsToMenu(ChatMenu glovesSelectionMenu, Action<CCSPlayerController?, ChatMenuOption> handleGloveSelection)
+			// Add weapon options to the weapon selection menu
-        {
 			foreach (var gloveObject in glovesList)
 			{
 				string paintName = gloveObject["paint_name"]?.ToString() ?? "";
@@ -468,10 +420,8 @@ void HandleSelectedGlove(CCSPlayerController? player, JObject selectedGlove, str
 				if (paintName.Length > 0)
 					glovesSelectionMenu.AddMenuOption(paintName, handleGloveSelection);
 			}
-        }
 
-        private void AddCommandToOpenGloveSelectionMenu(ChatMenu glovesSelectionMenu)
+			// Command to open the weapon selection menu for players
-        {
 			AddCommand($"css_{Config.Additional.CommandGlove}", "Gloves selection menu", (player, info) =>
 							{
 								if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;

Database.cs

@@ -12,10 +12,17 @@ namespace WeaponPaints
 		}
 
 		public async Task<MySqlConnection> GetConnectionAsync()
+		{
+			try
 			{
 				var connection = new MySqlConnection(_dbConnectionString);
 				await connection.OpenAsync();
 				return connection;
 			}
+			catch (Exception)
+			{
+				throw;
+			}
+		}
 	}
 }

Events.cs

@@ -14,33 +14,42 @@ namespace WeaponPaints
 			if (player is null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID.ToString().Length != 17 ||
 				weaponSync == null || _database == null) return HookResult.Continue;
 
-            PlayerInfo playerInfo = new(
+			PlayerInfo playerInfo = new PlayerInfo
-                (int)player.Index,
+			{
-                player.Slot,
+				UserId = player.UserId,
-                player.UserId,
+				Slot = player.Slot,
-                player.SteamID.ToString(),
+				Index = (int)player.Index,
-                player.PlayerName,
+				SteamId = player.SteamID.ToString(),
-                player.IpAddress?.Split(":")[0]
+				Name = player.PlayerName,
-            );
+				IpAddress = player.IpAddress?.Split(":")[0]
+			};
 
 			try
 			{
+				List<Task> tasks = new List<Task>();
+
 				if (Config.Additional.SkinEnabled)
 				{
-					Task.Run(() => weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+					tasks.Add(Task.Run(() => weaponSync.GetWeaponPaintsFromDatabase(playerInfo)));
 				}
 				if (Config.Additional.KnifeEnabled)
 				{
-					Task.Run(() => weaponSync.GetKnifeFromDatabase(playerInfo));
+					tasks.Add(Task.Run(() => weaponSync.GetKnifeFromDatabase(playerInfo)));
 				}
 				if (Config.Additional.GloveEnabled)
 				{
-					Task.Run(() => weaponSync.GetGloveFromDatabase(playerInfo));
+					tasks.Add(Task.Run(() => weaponSync.GetGloveFromDatabase(playerInfo)));
 				}
+
+				Task.WaitAll(tasks.ToArray());
 			}
-			catch (Exception ex)
+			catch (AggregateException ex)
 			{
-				Console.WriteLine($"An error occurred: {ex.Message}");
+				// Handle the exception
+				foreach (var innerException in ex.InnerExceptions)
+				{
+					Console.WriteLine($"An error occurred for player {player}: {innerException.Message}");
+				}
 			}
 
 			return HookResult.Continue;
@@ -54,24 +63,29 @@ namespace WeaponPaints
 			if (player is null || !player.IsValid || player.IsBot ||
 				player.IsHLTV || player.SteamID.ToString().Length != 17) return HookResult.Continue;
 
-            PlayerInfo playerInfo = new(
+			PlayerInfo playerInfo = new PlayerInfo
-                (int)player.Index,
+			{
-                player.Slot,
+				UserId = player.UserId,
-                player.UserId,
+				Slot = player.Slot,
-                player.SteamID.ToString(),
+				Index = (int)player.Index,
-                player.PlayerName,
+				SteamId = player.SteamID.ToString(),
-                player.IpAddress?.Split(":")[0]
+				Name = player.PlayerName,
-            );
+				IpAddress = player.IpAddress?.Split(":")[0]
+			};
 
 			if (weaponSync != null)
 			{
-				// Run weapon sync tasks asynchronously
 				Task.Run(async () =>
+				{
+					try
 					{
 						await weaponSync.SyncWeaponPaintsToDatabase(playerInfo);
-				});
+					}
+					catch (Exception ex)
+					{
+						Utility.Log($"Error syncing weapon paints: {ex.Message}");
+					}
 
-				// Remove player data
 					if (Config.Additional.SkinEnabled)
 					{
 						gPlayerWeaponsInfo.TryRemove(player.Slot, out _);
@@ -84,6 +98,7 @@ namespace WeaponPaints
 					{
 						g_playersGlove.TryRemove(player.Slot, out _);
 					}
+				});
 			}
 
 			// Remove player's command cooldown
@@ -134,7 +149,7 @@ namespace WeaponPaints
 
 			CCSPlayerController? player = Utilities.GetEntityFromIndex<CCSPlayerPawn>((int)activator.Index).OriginalController.Value;
 
-			if (player == null || player.IsBot || player.IsHLTV ||
+			if (player == null || player.IsBot || player.PlayerPawn == null || !player.PlayerPawn.IsValid || !player.PawnIsAlive ||
 				player.SteamID.ToString().Length != 17 || !g_knifePickupCount.TryGetValue(player.Slot, out var pickupCount) ||
 				!g_playersKnife.ContainsKey(player.Slot))
 			{
@@ -188,6 +203,11 @@ namespace WeaponPaints
 			if (player is null || !player.IsValid || !Config.Additional.KnifeEnabled && !Config.Additional.GloveEnabled)
 				return HookResult.Continue;
 
+			CCSPlayerPawn? pawn = player.PlayerPawn.Value;
+
+			if (pawn == null || !pawn.IsValid)
+				return HookResult.Continue;
+
 			g_knifePickupCount[player.Slot] = 0;
 
 			if (!PlayerHasKnife(player))
@@ -218,12 +238,13 @@ namespace WeaponPaints
 
 			return HookResult.Continue;
 		}
+
 		private void OnTick()
 		{
 			foreach (var player in Utilities.GetPlayers().Where(p =>
-							p is not null && p.IsValid &&
+							p is not null && p.IsValid && p.PlayerPawn != null && p.PlayerPawn.IsValid &&
 							(LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE && p.SteamID.ToString().Length == 17
-							&& !p.IsBot && !p.IsHLTV && p.Connected == PlayerConnectedState.PlayerConnected && p.Team != CounterStrikeSharp.API.Modules.Utils.CsTeam.None
+							&& !p.IsBot && !p.IsHLTV && p.Connected == PlayerConnectedState.PlayerConnected
 							)
 				)
 			{
@@ -295,7 +316,7 @@ namespace WeaponPaints
 			//RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
 			//RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
-			RegisterListener<Listeners.OnTick>(OnTick);
+			//RegisterListener<Listeners.OnTick>(OnTick);
 
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);

PlayerExtensions.cs

@@ -7,15 +7,9 @@ public static class PlayerExtensions
 {
 	public static void Print(this CCSPlayerController controller, string message)
 	{
-        if (WeaponPaints._localizer == null)
+		if (WeaponPaints._localizer == null) return;
-        {
-            controller.PrintToChat(message);
-        }
-        else
-        {
 		StringBuilder _message = new(WeaponPaints._localizer["wp_prefix"]);
 		_message.Append(message);
 		controller.PrintToChat(_message.ToString());
 	}
 }
-}

PlayerInfo.cs

@@ -8,17 +8,5 @@
 		public string? SteamId { get; set; }
 		public string? Name { get; set; }
 		public string? IpAddress { get; set; }
-
-        public PlayerInfo() { }
-
-        public PlayerInfo(int index, int slot, int? userId, string? steamId, string? name, string? ipAddress)
-        {
-            Index = index;
-            Slot = slot;
-            UserId = userId;
-            SteamId = steamId;
-            Name = name;
-            IpAddress = ipAddress;
-        }
 	}
 }

SchemaString.cs

@@ -13,13 +13,12 @@ public class SchemaString<TSchemaClass> : NativeObject where TSchemaClass : Nati
 	internal unsafe void Set(string str)
 	{
 		var bytes = Encoding.UTF8.GetBytes(str);
-        var handle = Handle.ToInt64();
 
 		for (var i = 0; i < bytes.Length; i++)
 		{
-            Unsafe.Write((void*)(handle + i), bytes[i]);
+			Unsafe.Write((void*)(Handle.ToInt64() + i), bytes[i]);
 		}
 
-        Unsafe.Write((void*)(handle + bytes.Length), 0);
+		Unsafe.Write((void*)(Handle.ToInt64() + bytes.Length), 0);
 	}
 }

Utility.cs

@@ -61,14 +61,7 @@ namespace WeaponPaints
                       UNIQUE (`steamid`)
 					) ENGINE=InnoDB"
 			};
-                    /*string[] createTableQueries = new[]
+
-                    {
-                        @"CREATE TABLE IF NOT EXISTS `wp_players` (`steamid` BIGINT UNSIGNED NOT NULL, `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        @"CREATE TABLE IF NOT EXISTS `wp_players_skins` (`steamid` BIGINT UNSIGNED NOT NULL, `team` SMALLINT UNSIGNED NOT NULL, `weapon` SMALLINT UNSIGNED NOT NULL, `paint` SMALLINT UNSIGNED NOT NULL, `wear` FLOAT NOT NULL DEFAULT 0.00001, `seed` SMALLINT UNSIGNED NOT NULL DEFAULT 0, `nametag` VARCHAR(20) DEFAULT NULL, `stattrack` INT UNSIGNED NOT NULL DEFAULT 0, `stattrack_enabled` SMALLINT NOT NULL DEFAULT 0, PRIMARY KEY (`steamid`,`weapon`,`team`), FOREIGN KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        @"CREATE TABLE IF NOT EXISTS `wp_players_knife` (`steamid` BIGINT UNSIGNED NOT NULL, `knife_t` SMALLINT UNSIGNED NOT NULL, `knife_ct` SMALLINT UNSIGNED NOT NULL, PRIMARY KEY (`steamid`), FOREIGN KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        @"CREATE TABLE IF NOT EXISTS `wp_players_music` (`steamid` BIGINT UNSIGNED NOT NULL, `music` SMALLINT UNSIGNED DEFAULT NULL, PRIMARY KEY (`steamid`), FOREIGN KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;",
-                        @"CREATE TABLE IF NOT EXISTS `wp_players_gloves` (`steamid` BIGINT UNSIGNED NOT NULL, `glove_t` SMALLINT UNSIGNED NOT NULL, `glove_ct` SMALLINT UNSIGNED NOT NULL, PRIMARY KEY (`steamid`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;"
-                    };*/
 					foreach (var query in createTableQueries)
 					{
 						await connection.ExecuteAsync(query, transaction: transaction);

VERSION

@@ -1 +1 @@
-1.9b
+1.9c

WeaponAction.cs

@@ -13,7 +13,8 @@ namespace WeaponPaints
 		internal static void ChangeWeaponAttributes(CBasePlayerWeapon? weapon, CCSPlayerController? player, bool isKnife = false)
 		{
 			if (player is null || weapon is null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
-            if (!gPlayerWeaponsInfo.TryGetValue(player.Slot, out _)) return;
+
+			if (!gPlayerWeaponsInfo.ContainsKey(player.Slot)) return;
 
 			if (isKnife && !g_playersKnife.ContainsKey(player.Slot) || isKnife && g_playersKnife[player.Slot] == "weapon_knife") return;
 
@@ -141,8 +142,10 @@ namespace WeaponPaints
 		{
 			if (!_config.Additional.KnifeEnabled || player == null || !player.IsValid) return;
 
-			WeaponPaints.Instance.AddTimer(1.0f, () =>
+			Instance.AddTimer(1.0f, () =>
 			{
+				if (PlayerHasKnife(player)) return;
+
 				string knifeToGive;
 				if (g_playersKnife.TryGetValue(player.Slot, out var knife))
 				{
@@ -180,7 +183,7 @@ namespace WeaponPaints
 				return false;
 			}
 
-			if (player.PlayerPawn?.Value == null || player.PlayerPawn?.Value.WeaponServices == null || player.PlayerPawn?.Value.ItemServices == null)
+			if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
 				return false;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices?.MyWeapons;
@@ -255,8 +258,6 @@ namespace WeaponPaints
 
 						weaponsWithAmmo[weaponByDefindex].Add((clip1, reservedAmmo));
 					}
-
-					//player.RemoveItemByDesignerName(weapon.Value.DesignerName, false);
 				}
 				catch (Exception ex)
 				{
@@ -270,18 +271,21 @@ namespace WeaponPaints
 				player.ExecuteClientCommand($"slot {i}");
 				player.ExecuteClientCommand($"slot {i}");
 
-				AddTimer(0.1f, () =>
+				AddTimer(0.2f, () =>
 				{
 					var weapon = player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value;
-					CCSWeaponBaseGun? gun = weapon?.As<CCSWeaponBaseGun>();
+
+					if (weapon is null || !weapon.IsValid) return;
+
+					CCSWeaponBaseGun gun = weapon.As<CCSWeaponBaseGun>();
 
 					if (gun == null || gun.VData == null) return;
 
-					if (gun?.VData?.GearSlot == gear_slot_t.GEAR_SLOT_C4 || gun?.VData?.GearSlot == gear_slot_t.GEAR_SLOT_GRENADES) return;
+					if (gun.VData.GearSlot == gear_slot_t.GEAR_SLOT_C4 || gun.VData.GearSlot == gear_slot_t.GEAR_SLOT_GRENADES) return;
 
 					player.DropActiveWeapon();
 
-					AddTimer(0.22f, () =>
+					AddTimer(0.25f, () =>
 					{
 						if (gun != null && gun.IsValid && gun.State == CSWeaponState_t.WEAPON_NOT_CARRIED)
 						{

WeaponInfo.cs

@@ -3,16 +3,7 @@
 	public class WeaponInfo
 	{
 		public int Paint { get; set; }
-        public int Seed { get; set; }
+		public int Seed { get; set; } = 0;
-        public float Wear { get; set; }
+		public float Wear { get; set; } = 0f;
-
-        public WeaponInfo() : this(0, 0, 0f) { }
-
-        public WeaponInfo(int paint, int seed, float wear)
-        {
-            Paint = paint;
-            Seed = seed;
-            Wear = wear;
-        }
 	}
 }

WeaponPaints.cs

@@ -14,7 +14,7 @@ namespace WeaponPaints;
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static WeaponPaints Instance { get; private set; } = new();
-    internal static readonly int[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
+
 	internal static readonly Dictionary<string, string> weaponList = new()
 	{
 		{"weapon_deagle", "Desert Eagle"},
@@ -151,12 +151,12 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{ 525, "weapon_knife_skeleton" },
 		{ 526, "weapon_knife_kukri" }
 	};
-    public static MemoryFunctionVoid<IntPtr, string, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr> GiveNamedItem2 = new(@"\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x83\xEC\x18\x48\x89\x7D\xC8\x48\x85\xF6\x74");
+
 	public WeaponPaintsConfig Config { get; set; } = new();
 	public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin, gloves and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.9b";
+	public override string ModuleVersion => "1.9c";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -181,13 +181,15 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 				gPlayerWeaponsInfo.TryRemove((int)player.Slot, out _);
 				g_playersKnife.TryRemove((int)player.Slot, out _);
 
-                PlayerInfo playerInfo = new PlayerInfo(
+				PlayerInfo playerInfo = new PlayerInfo
-					(int)player.Slot,
+				{
-					player.Slot,
+					UserId = player.UserId,
-					player.UserId,
+					Slot = player.Slot,
-					player?.SteamID.ToString(),
+					Index = (int)player.Slot,
-					player?.PlayerName,
+					SteamId = player?.SteamID.ToString(),
-					player?.IpAddress?.Split(":")[0]);
+					Name = player?.PlayerName,
+					IpAddress = player?.IpAddress?.Split(":")[0]
+				};
 
 				if (Config.Additional.SkinEnabled)
 				{
@@ -217,15 +219,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		RegisterListeners();
 		RegisterCommands();
 	}
-    public static void PlayerGiveNamedItem(CCSPlayerController player, string item)
-    {
-        if (!player.PlayerPawn.IsValid) return;
-        if (player.PlayerPawn.Value == null) return;
-        if (!player.PlayerPawn.Value.IsValid) return;
-        if (player.PlayerPawn.Value.ItemServices == null) return;
 
-        GiveNamedItem2.Invoke(player.PlayerPawn.Value.ItemServices.Handle, item, 0, 0, 0, 0, 0, 0);
-    }
 	public void OnConfigParsed(WeaponPaintsConfig config)
 	{
 		if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)

WeaponPaints.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.172" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.168" />
     <PackageReference Include="Dapper" Version="2.1.28" />
     <PackageReference Include="MySqlConnector" Version="2.3.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

WeaponSynchronization.cs

@@ -14,11 +14,13 @@ namespace WeaponPaints
 			_config = config;
 		}
 
-		internal async Task GetKnifeFromDatabase(PlayerInfo player)
+		public async Task GetKnifeFromDatabase(PlayerInfo player)
 		{
-			if (!_config.Additional.KnifeEnabled) return;
 			try
 			{
+				if (!_config.Additional.KnifeEnabled || string.IsNullOrEmpty(player?.SteamId))
+					return;
+
 				await using var connection = await _database.GetConnectionAsync();
 				string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
 				string? playerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
@@ -28,54 +30,47 @@ namespace WeaponPaints
 					WeaponPaints.g_playersKnife[player.Slot] = playerKnife;
 				}
 			}
-			catch (Exception e)
+			catch (Exception ex)
 			{
-				Utility.Log(e.Message);
+				Utility.Log($"An error occurred in GetKnifeFromDatabase: {ex.Message}");
-				return;
 			}
 		}
 
-		internal async Task GetGloveFromDatabase(PlayerInfo player)
+		public async Task GetGloveFromDatabase(PlayerInfo player)
 		{
-			if (!_config.Additional.GloveEnabled) return;
-
 			try
 			{
-				// Ensure proper disposal of resources using "using" statement
+				if (!_config.Additional.GloveEnabled || string.IsNullOrEmpty(player?.SteamId))
+					return;
+
 				await using var connection = await _database.GetConnectionAsync();
-
-				// Construct the SQL query with specific columns for better performance
 				string query = "SELECT `weapon_defindex` FROM `wp_player_gloves` WHERE `steamid` = @steamid";
-
-				// Execute the query and retrieve glove data
 				ushort? gloveData = await connection.QueryFirstOrDefaultAsync<ushort?>(query, new { steamid = player.SteamId });
 
-				// Check if glove data is retrieved successfully
 				if (gloveData != null)
 				{
-					// Update g_playersGlove dictionary with glove data
 					WeaponPaints.g_playersGlove[player.Slot] = gloveData.Value;
 				}
 			}
-			catch (Exception e)
+			catch (Exception ex)
 			{
-				// Log any exceptions occurred during database operation
+				Utility.Log($"An error occurred in GetGloveFromDatabase: {ex.Message}");
-				Utility.Log("An error occurred while fetching glove data: " + e.Message);
 			}
 		}
 
-		internal async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
+		public async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
 		{
-			if (!_config.Additional.SkinEnabled || player == null || player.SteamId == null) return;
-
 			try
 			{
-				await using var connection = await _database.GetConnectionAsync();
+				if (!_config.Additional.SkinEnabled || player == null || string.IsNullOrEmpty(player.SteamId))
-                string query = "SELECT `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed` FROM `wp_player_skins` WHERE `steamid` = @steamid";
+					return;
 
+				await using var connection = await _database.GetConnectionAsync();
+				string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
 				var playerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
 
-				if (playerSkins == null) return;
+				if (playerSkins == null)
+					return;
 
 				var weaponInfos = new ConcurrentDictionary<int, WeaponInfo>();
 
@@ -98,9 +93,9 @@ namespace WeaponPaints
 
 				WeaponPaints.gPlayerWeaponsInfo[player.Slot] = weaponInfos;
 			}
-			catch (Exception e)
+			catch (Exception ex)
 			{
-				Utility.Log($"Database error occurred: {e.Message}");
+				Utility.Log($"An error occurred in GetWeaponPaintsFromDatabase: {ex.Message}");
 			}
 		}
 
@@ -120,7 +115,6 @@ namespace WeaponPaints
 			}
 		}
 
-
 		internal async Task SyncGloveToDatabase(PlayerInfo player, int defindex)
 		{
 			if (!_config.Additional.GloveEnabled || player == null || string.IsNullOrEmpty(player.SteamId)) return;
@@ -159,22 +153,14 @@ namespace WeaponPaints
 								   "VALUES (@steamid, @weaponDefIndex, @paintId, @wear, @seed) " +
 								   "ON DUPLICATE KEY UPDATE `weapon_paint_id` = @paintId, `weapon_wear` = @wear, `weapon_seed` = @seed";
 
-                    var parameters = new DynamicParameters();
+					var parameters = new { steamid = player.SteamId, weaponDefIndex, paintId, wear, seed };
-                    parameters.Add("@steamid", player.SteamId);
-                    parameters.Add("@weaponDefIndex", weaponDefIndex);
-                    parameters.Add("@paintId", paintId);
-                    parameters.Add("@wear", wear);
-                    parameters.Add("@seed", seed);
-
 					await connection.ExecuteAsync(query, parameters);
 				}
-
 			}
 			catch (Exception e)
 			{
 				Utility.Log($"Error syncing weapon paints to database: {e.Message}");
 			}
 		}
-
 	}
 }