Merge pull request #344 from daffyyyy/main

3.2b

Commands.cs

@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Menu;
@@ -106,6 +107,16 @@ public partial class WeaponPaints
 
 	private void RegisterCommands()
 	{
+		_config.Additional.CommandStattrak.ForEach(c =>
+		{
+			AddCommand($"css_{c}", "Stattrak toggle", (player, info) =>
+			{
+				if (!Utility.IsPlayerValid(player)) return;
+
+				OnCommandStattrak(player, info);
+			});
+		});
+
 		_config.Additional.CommandSkin.ForEach(c =>
 		{
 			AddCommand($"css_{c}", "Skins info", (player, info) =>
@@ -138,6 +149,30 @@ public partial class WeaponPaints
 		}
 	}
 
+	private void OnCommandStattrak(CCSPlayerController? player, CommandInfo commandInfo)
+	{
+		if (player == null || !player.IsValid) return;
+		
+		if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var teamInfo) || 
+		    !teamInfo.TryGetValue(player.Team, out var teamWeapons) )
+			return;
+		
+		var weapon = player.PlayerPawn.Value?.WeaponServices?.ActiveWeapon.Value;
+		
+		if (weapon == null || !weapon.IsValid)
+			return;
+		if (!teamWeapons.TryGetValue(weapon.AttributeManager.Item.ItemDefinitionIndex, out var teamWeapon))
+			return;
+
+		teamWeapon.StatTrak = !teamWeapon.StatTrak;
+		RefreshWeapons(player);
+
+		if (!string.IsNullOrEmpty(Localizer["wp_stattrak_action"]))
+		{
+			player.Print(Localizer["wp_stattrak_action"]);
+		}
+	}
+
 	private void SetupKnifeMenu()
 	{
 		if (!Config.Additional.KnifeEnabled || !_gBCommandsAllowed) return;
@@ -146,7 +181,7 @@ public partial class WeaponPaints
 			.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
 			.ToDictionary(pair => pair.Key, pair => pair.Value);
 
-		var giveItemMenu = MenuApi?.NewMenu(Localizer["wp_knife_menu_title"]);
+		var giveItemMenu = Utility.CreateMenu(Localizer["wp_knife_menu_title"]);
 			
 		var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
 		{
@@ -230,7 +265,7 @@ public partial class WeaponPaints
 			.Except([new KeyValuePair<string, string>("weapon_knife", "Default Knife")])
 			.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
 
-		var weaponSelectionMenu = MenuApi?.NewMenu(Localizer["wp_skin_menu_weapon_title"]);
+		var weaponSelectionMenu = Utility.CreateMenu(Localizer["wp_skin_menu_weapon_title"]);
 
 		// Function to handle skin selection for a specific weapon
 		var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
@@ -245,7 +280,7 @@ public partial class WeaponPaints
 				weaponName?.ToString() == selectedWeaponClassname
 			)?.ToList();
 
-			var skinSubMenu = MenuApi?.NewMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
+			var skinSubMenu = Utility.CreateMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
 
 			// Function to handle skin selection for the chosen weapon
 			var handleSkinSelection = (CCSPlayerController p, ChatMenuOption opt) =>
@@ -381,7 +416,7 @@ public partial class WeaponPaints
 
 	private void SetupGlovesMenu()
 	{
-		var glovesSelectionMenu = MenuApi?.NewMenu(Localizer["wp_glove_menu_title"]);
+		var glovesSelectionMenu = Utility.CreateMenu(Localizer["wp_glove_menu_title"]);
 		if (glovesSelectionMenu == null) return;
 		glovesSelectionMenu.PostSelectAction = PostSelectAction.Close;
 			
@@ -590,7 +625,7 @@ public partial class WeaponPaints
 				if (!CommandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
 				    DateTime.UtcNow >= (CommandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
-					var agentsSelectionMenu = MenuApi?.NewMenu(Localizer["wp_agent_menu_title"]);
+					var agentsSelectionMenu = Utility.CreateMenu(Localizer["wp_agent_menu_title"]);
 					if (agentsSelectionMenu == null) return;
 					agentsSelectionMenu.PostSelectAction = PostSelectAction.Close;
 
@@ -630,7 +665,7 @@ public partial class WeaponPaints
 
 	private void SetupMusicMenu()
 	{
-		var musicSelectionMenu = MenuApi?.NewMenu(Localizer["wp_music_menu_title"]);
+		var musicSelectionMenu = Utility.CreateMenu(Localizer["wp_music_menu_title"]);
 		if (musicSelectionMenu == null) return;
 		musicSelectionMenu.PostSelectAction = PostSelectAction.Close;
 
@@ -765,7 +800,7 @@ public partial class WeaponPaints
 	
 	private void SetupPinsMenu()
 	{
-		var pinsSelectionMenu = MenuApi?.NewMenu(Localizer["wp_pins_menu_title"]);
+		var pinsSelectionMenu = Utility.CreateMenu(Localizer["wp_pins_menu_title"]);
 		if (pinsSelectionMenu == null) return;
 		pinsSelectionMenu.PostSelectAction = PostSelectAction.Close;
 

Config.cs

@@ -43,6 +43,9 @@ namespace WeaponPaints
 
 		[JsonPropertyName("CommandAgent")]
 		public List<string> CommandAgent { get; set; } = ["agents"];
+		
+		[JsonPropertyName("CommandStattrak")]
+		public List<string> CommandStattrak { get; set; } = ["stattrak", "st"];
 
 		[JsonPropertyName("CommandSkin")]
 		public List<string> CommandSkin { get; set; } = ["ws"];
@@ -68,7 +71,7 @@ namespace WeaponPaints
 
 	public class WeaponPaintsConfig : BasePluginConfig
 	{
-        [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 9;
+        [JsonPropertyName("ConfigVersion")] public override int Version { get; set; } = 10;
 
         [JsonPropertyName("SkinsLanguage")]
 		public string SkinsLanguage { get; set; } = "en";
@@ -89,12 +92,15 @@ namespace WeaponPaints
 		public string DatabaseName { get; set; } = "";
 
 		[JsonPropertyName("CmdRefreshCooldownSeconds")]
-		public int CmdRefreshCooldownSeconds { get; set; } = 10;
+		public int CmdRefreshCooldownSeconds { get; set; } = 3;
 
 		[JsonPropertyName("Website")]
 		public string Website { get; set; } = "example.com/skins";
 
 		[JsonPropertyName("Additional")]
 		public Additional Additional { get; set; } = new();
+		
+		[JsonPropertyName("MenuType")]
+		public string MenuType { get; set; } = "selectable";
 	}
 }

Events.cs

@@ -2,6 +2,7 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Entities;
+using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 
@@ -79,13 +80,17 @@ namespace WeaponPaints
 				IpAddress = player.IpAddress?.Split(":")[0]
 			};
 
-			if (WeaponSync != null)
+			Task.Run(async () => 
-				_ = Task.Run(async () => await WeaponSync.SyncStatTrakToDatabase(playerInfo));
-
-			if (Config.Additional.SkinEnabled)
 			{
-				GPlayerWeaponsInfo.TryRemove(player.Slot, out _);
+				if (WeaponSync != null)
-			}
+					await WeaponSync.SyncStatTrakToDatabase(playerInfo);
+
+				if (Config.Additional.SkinEnabled)
+				{
+					GPlayerWeaponsInfo.TryRemove(player.Slot, out _);
+				}
+			});
+
 			if (Config.Additional.KnifeEnabled)
 			{
 				GPlayersKnife.TryRemove(player.Slot, out _);
@@ -106,7 +111,7 @@ namespace WeaponPaints
 			{
 				GPlayersPin.TryRemove(player.Slot, out _);
 			}
-
+			
 			_temporaryPlayerWeaponWear.TryRemove(player.Slot, out _);
 			CommandsCooldown.Remove(player.Slot);
 
@@ -116,9 +121,12 @@ namespace WeaponPaints
 		private void OnMapStart(string mapName)
 		{
 			if (Config.Additional is { KnifeEnabled: false, SkinEnabled: false, GloveEnabled: false }) return;
-
+			
 			if (Database != null)
 				WeaponSync = new WeaponSynchronization(Database, Config);
+
+			_fadeSeed = 0;
+			_nextItemId = MinimumCustomItemId;
 		}
 
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
@@ -197,7 +205,17 @@ namespace WeaponPaints
 
 				var player = GetPlayerFromItemServices(itemServices);
 				if (player != null)
+				{
+					var weaponServices = player.PlayerPawn.Value?.WeaponServices;
+					
 					GivePlayerWeaponSkin(player, weapon);
+					
+					if (weaponServices is { MyWeapons.Count: 1 })
+					{
+						// player.GiveNamedItem(CsItem.Healthshot);
+						// newWeapon.AddEntityIOEvent("Kill", newWeapon, null, "", 0.1f);
+					}
+				}
 			}
 			catch { }
 
@@ -269,9 +287,10 @@ namespace WeaponPaints
 		[GameEventHandler]
 		public HookResult OnItemPickup(EventItemPickup @event, GameEventInfo _)
 		{
-			if (!IsWindows) return HookResult.Continue;
+			// if (!IsWindows) return HookResult.Continue;
-			
 			var player = @event.Userid;
+			if (!@event.Item.Contains("knife")) return HookResult.Continue;
+			
 			if (player != null && player is { IsValid: true, Connected: PlayerConnectedState.PlayerConnected, PawnIsAlive: true, PlayerPawn.IsValid: true })
 			{
 				GiveOnItemPickup(player);
@@ -331,8 +350,7 @@ namespace WeaponPaints
 			if (Config.Additional.ShowSkinImage)
 				RegisterListener<Listeners.OnTick>(OnTick);
 
-			if (!IsWindows)
+			VirtualFunctions.GiveNamedItemFunc.Hook(OnGiveNamedItemPost, HookMode.Post);
-				VirtualFunctions.GiveNamedItemFunc.Hook(OnGiveNamedItemPost, HookMode.Post);
 		}
 	}
 }

Utility.cs

@@ -1,6 +1,8 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Translations;
+using CounterStrikeSharp.API.Modules.Menu;
 using Dapper;
+using MenuManager;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -188,10 +190,32 @@ namespace WeaponPaints
 			Console.WriteLine("[WeaponPaints] " + message);
 			Console.ResetColor();
 		}
-
+		
-		internal static string ReplaceTags(string message)
+		internal static IMenu? CreateMenu(string title)
 		{
-			return message.ReplaceColorTags();
+			var menuType = WeaponPaints.Instance.Config.MenuType.ToLower();
+        
+			var menu = menuType switch
+			{
+				_ when menuType.Equals("selectable", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenu(title),
+
+				_ when menuType.Equals("dynamic", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ButtonMenu),
+
+				_ when menuType.Equals("center", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.CenterMenu),
+
+				_ when menuType.Equals("chat", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ChatMenu),
+
+				_ when menuType.Equals("console", StringComparison.CurrentCultureIgnoreCase) =>
+					WeaponPaints.MenuApi?.NewMenuForcetype(title, MenuType.ConsoleMenu),
+
+				_ => WeaponPaints.MenuApi?.NewMenu(title)
+			};
+
+			return menu;
 		}
 
 		internal static async Task CheckVersion(string version, ILogger logger)

VERSION

@@ -1 +1 @@
-2.9c
+3.1b

Variables.cs

@@ -77,7 +77,8 @@ public partial class WeaponPaints
 	internal static readonly ConcurrentDictionary<int, ConcurrentDictionary<CsTeam, ushort>> GPlayersGlove = new();
 	internal static readonly ConcurrentDictionary<int, ConcurrentDictionary<CsTeam, ushort>> GPlayersMusic = new();
 	internal static readonly ConcurrentDictionary<int, ConcurrentDictionary<CsTeam, ushort>> GPlayersPin = new();
-	public static readonly ConcurrentDictionary<int, (string? CT, string? T)> GPlayersAgent = new();
+	internal static readonly ConcurrentDictionary<int, (string? CT, string? T)> GPlayersAgent = new();
+	internal static readonly Dictionary<int, int> GPlayersKnivesPickup = [];
 	internal static readonly ConcurrentDictionary<int, ConcurrentDictionary<CsTeam, ConcurrentDictionary<int, WeaponInfo>>> GPlayerWeaponsInfo = new();
 	internal static List<JObject> SkinsList = [];
 	internal static List<JObject> PinsList = [];
@@ -92,7 +93,7 @@ public partial class WeaponPaints
 	internal static Database? Database;
 
 	private static readonly MemoryFunctionVoid<nint, string, float> CAttributeListSetOrAddAttributeValueByName = new(GameData.GetSignature("CAttributeList_SetOrAddAttributeValueByName"));
-
+	
 	private static readonly MemoryFunctionWithReturn<nint, string, int, int> SetBodygroupFunc = new(
 		GameData.GetSignature("CBaseModelEntity_SetBodygroup"));
 
@@ -165,4 +166,6 @@ public partial class WeaponPaints
 	
 	internal static IMenuApi? MenuApi;
 	private static readonly PluginCapability<IMenuApi> MenuCapability = new("menu:nfcore");
+	
+	private int _fadeSeed;
 }

WeaponAction.cs

@@ -20,8 +20,10 @@ namespace WeaponPaints
 
 			bool isKnife = weapon.DesignerName.Contains("knife") || weapon.DesignerName.Contains("bayonet");
 
-			if (isKnife && !GPlayersKnife.ContainsKey(player.Slot) ||
+			if (isKnife && (!GPlayersKnife.ContainsKey(player.Slot) ||
-			    isKnife && GPlayersKnife[player.Slot][player.Team] == "weapon_knife") return;
+			                !GPlayersKnife[player.Slot].ContainsKey(player.Team) ||
+			                GPlayersKnife[player.Slot][player.Team] == "weapon_knife"))
+				return;
 
 			if (isKnife)
 			{
@@ -36,11 +38,15 @@ namespace WeaponPaints
 				weapon.AttributeManager.Item.ItemDefinitionIndex = (ushort)newDefIndex.Key;
 				weapon.AttributeManager.Item.EntityQuality = 3;
 			}
+			else
+			{
+				weapon.AttributeManager.Item.EntityQuality = 0;
+			}
 			
 			UpdatePlayerEconItemId(weapon.AttributeManager.Item);
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
-			int fallbackPaintKit = 0;
+			int fallbackPaintKit;
 			
 			weapon.AttributeManager.Item.AccountID = (uint)player.SteamID;
 			
@@ -48,7 +54,9 @@ namespace WeaponPaints
 			bool isLegacyModel;
 
 			if (_config.Additional.GiveRandomSkin &&
-				 !GPlayerWeaponsInfo[player.Slot][player.Team].ContainsKey(weaponDefIndex))
+			    GPlayerWeaponsInfo.ContainsKey(player.Slot) &&
+			    (!GPlayerWeaponsInfo[player.Slot].ContainsKey(player.Team) ||
+			     !GPlayerWeaponsInfo[player.Slot][player.Team].ContainsKey(weaponDefIndex)))
 			{
 				// Random skins
 				weapon.FallbackPaintKit = GetRandomPaint(weaponDefIndex);
@@ -81,7 +89,11 @@ namespace WeaponPaints
 				return;
 			}
 
-			if (!GPlayerWeaponsInfo[player.Slot][player.Team].TryGetValue(weaponDefIndex, out var value) || value.Paint == 0) return;
+			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var teamInfo) || 
+			    !teamInfo.TryGetValue(player.Team, out var teamWeapons) )
+				return;
+			if (!teamWeapons.TryGetValue(weaponDefIndex, out var value))
+				return;
 
 			var weaponInfo = value;
 			//Log($"Apply on {weapon.DesignerName}({weapon.AttributeManager.Item.ItemDefinitionIndex}) paint {gPlayerWeaponPaints[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} seed {gPlayerWeaponSeed[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} wear {gPlayerWeaponWear[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]}");
@@ -94,12 +106,16 @@ namespace WeaponPaints
 			weapon.AttributeManager.Item.ItemIDHigh = weapon.AttributeManager.Item.ItemIDLow >> 32;
 			weapon.AttributeManager.Item.CustomName = weaponInfo.Nametag;
 			weapon.FallbackPaintKit = weaponInfo.Paint;
-			weapon.FallbackSeed = weaponInfo.Seed;
+			
+			weapon.FallbackSeed = weaponInfo is { Paint: 38, Seed: 0 } ? _fadeSeed++ : weaponInfo.Seed;
+			
 			weapon.FallbackWear = weaponInfo.Wear;
 			CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "set item texture prefab", weapon.FallbackPaintKit);
 
 			if (weaponInfo.StatTrak)
-			{				
+			{			
+				weapon.AttributeManager.Item.EntityQuality = 9;
+
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "kill eater", ViewAsFloat((uint)weaponInfo.StatTrakCount));
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "kill eater score type", 0);
 				
@@ -112,8 +128,6 @@ namespace WeaponPaints
 			if (fallbackPaintKit == 0)
 				return;
 
-			if (isKnife) return;
-			
 			if (weaponInfo.KeyChain != null) SetKeychain(player, weapon);
 			if (weaponInfo.Stickers.Count > 0) SetStickers(player, weapon);
 
@@ -124,6 +138,7 @@ namespace WeaponPaints
 				.ToList();
 				
 			isLegacyModel = skinInfo.Count <= 0 || skinInfo[0].Value<bool>("legacy_model");
+
 			UpdatePlayerWeaponMeshGroupMask(player, weapon, isLegacyModel);
 		}
 
@@ -168,15 +183,13 @@ namespace WeaponPaints
 				
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
 					$"sticker slot {stickerSlot} id", ViewAsFloat(sticker.Id));
-				// CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
+				if (sticker.OffsetX != 0 || sticker.OffsetY != 0)
-				// 	$"sticker slot {stickerSlot} schema", stickerSlot);
+					CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
-				// if (stickerSlot == 5)
+						$"sticker slot {stickerSlot} schema", 0);
-				// {
+				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
-				// 	// CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
+					$"sticker slot {stickerSlot} offset x", sticker.OffsetX);
-				// 	// 	$"sticker slot {stickerSlot} offset x", 0.05f);
+				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
-				// 	// CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
+					$"sticker slot {stickerSlot} offset y", sticker.OffsetY);
-				// 	// 	$"sticker slot {stickerSlot} offset y", 0.02f);
-				// }
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
 					$"sticker slot {stickerSlot} wear", sticker.Wear);
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
@@ -199,8 +212,11 @@ namespace WeaponPaints
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
 			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var playerWeaponsInfo) ||
-			    !playerWeaponsInfo[player.Team].TryGetValue(weaponDefIndex, out var value) ||
+			    !playerWeaponsInfo.TryGetValue(player.Team, out var teamWeaponsInfo) ||
-			    value.KeyChain == null) return;
+			    !teamWeaponsInfo.TryGetValue(weaponDefIndex, out var value) ||
+			    value.KeyChain == null)
+				return;
+			
 			var keyChain = value.KeyChain;
 
 			CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
@@ -223,6 +239,7 @@ namespace WeaponPaints
 
 			//string knifeToGive = (CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife";
 			player.GiveNamedItem(CsItem.Knife);
+			Utilities.SetStateChanged(player, "CCSPlayerController", "m_pInventoryServices");
 		}
 
 		private static bool PlayerHasKnife(CCSPlayerController? player)
@@ -265,6 +282,8 @@ namespace WeaponPaints
 			if (player.Team is CsTeam.None or CsTeam.Spectator)
 				return;
 
+			var hasKnife = false;
+			
 			Dictionary<string, List<(int, int)>> weaponsWithAmmo = [];
 
 			foreach (var weapon in weapons)
@@ -272,7 +291,7 @@ namespace WeaponPaints
 				if (!weapon.IsValid || weapon.Value == null ||
 					!weapon.Value.IsValid || !weapon.Value.DesignerName.Contains("weapon_"))
 					continue;
-
+				
 				CCSWeaponBaseGun gun = weapon.Value.As<CCSWeaponBaseGun>();
 
 				if (weapon.Value.Entity == null) continue;
@@ -311,6 +330,7 @@ namespace WeaponPaints
 					if (weaponData.GearSlot == gear_slot_t.GEAR_SLOT_KNIFE)
 					{
 						weapon.Value?.AddEntityIOEvent("Kill", weapon.Value, null, "", 0.1f);
+						hasKnife = true;
 					}
 				}
 				catch (Exception ex)
@@ -322,9 +342,16 @@ namespace WeaponPaints
 			AddTimer(0.23f, () =>
 					{
 						if (!_gBCommandsAllowed) return;
-						
+
-						if (!PlayerHasKnife(player))
+						if (!PlayerHasKnife(player) && hasKnife)
-							GiveKnifeToPlayer(player);
+						{
+							var newKnife = new CBasePlayerWeapon(player.GiveNamedItem(CsItem.Knife));
+							newKnife.AddEntityIOEvent("Kill", newKnife, null, "", 0.01f);
+							var newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(CsItem.USP));
+							player.GiveNamedItem(CsItem.Knife);
+							player.ExecuteClientCommand("slot3");
+							newWeapon.AddEntityIOEvent("Kill", newWeapon, null, "", 0.01f);
+						}
 
 						foreach (var entry in weaponsWithAmmo)
 						{
@@ -377,9 +404,12 @@ namespace WeaponPaints
 						return;
 
 					if (!GPlayersGlove.TryGetValue(player.Slot, out var gloveInfo) ||
-					    !gloveInfo.TryGetValue(player.Team, out var gloveId) || gloveId == 0) return; 
+					    !gloveInfo.TryGetValue(player.Team, out var gloveId) ||
-
+					    gloveId == 0 ||
-					WeaponInfo weaponInfo = GPlayerWeaponsInfo[player.Slot][player.Team][gloveId];
+					    !GPlayerWeaponsInfo.TryGetValue(player.Slot, out var playerWeaponsInfo) ||
+					    !playerWeaponsInfo.TryGetValue(player.Team, out var teamWeaponsInfo) ||
+					    !teamWeaponsInfo.TryGetValue(gloveId, out var weaponInfo))
+						return;
 
 					item.ItemDefinitionIndex = gloveId;
 					item.ItemIDLow = 16384 & 0xFFFFFFFF;
@@ -443,6 +473,7 @@ namespace WeaponPaints
 			var viewModel = GetPlayerViewModel(player);
 			if (viewModel == null || viewModel.Weapon.Value == null ||
 			    viewModel.Weapon.Value.Index != weapon.Index) return;
+			
 			UpdateWeaponMeshGroupMask(viewModel, isLegacy);
 			Utilities.SetStateChanged(viewModel, "CBaseEntity", "m_CBodyComponent");
 		}
@@ -506,13 +537,22 @@ namespace WeaponPaints
 			
 			var myWeapons = pawn.WeaponServices?.MyWeapons;
 			if (myWeapons == null) return;
+			
 			foreach (var handle in myWeapons)
 			{
 				var weapon = handle.Value;
-				if (weapon != null && weapon.DesignerName.Contains("knife"))
+			
+				if (weapon == null || !weapon.IsValid) continue;
+				if (myWeapons.Count == 1)
 				{
-					GivePlayerWeaponSkin(player, weapon);
+					var newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(CsItem.USP));
+					weapon.AddEntityIOEvent("Kill", weapon, null, "", 0.01f);
+					player.GiveNamedItem(CsItem.Knife);
+					player.ExecuteClientCommand("slot3");
+					newWeapon.AddEntityIOEvent("Kill", newWeapon, null, "", 0.01f);
 				}
+					
+				GivePlayerWeaponSkin(player, weapon);
 			}
 		}
 		

WeaponInfo.cs

@@ -6,7 +6,7 @@
 		public int Seed { get; set; }
 		public float Wear { get; set; }
 		public string Nametag { get; set; } = "";
-		public bool StatTrak { get; set; } = false;
+		public bool StatTrak { get; set; }
 		public int StatTrakCount { get; set; }
 		public KeyChainInfo? KeyChain { get; set; }
 		public List<StickerInfo> Stickers { get; set; } = new();

WeaponPaints.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
+using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using Microsoft.Extensions.Logging;
 using MySqlConnector;
 
@@ -16,7 +17,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
     public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin, gloves, agents and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "2.9c";
+	public override string ModuleVersion => "3.1b";
 
 	public override void Load(bool hotReload)
 	{
@@ -39,6 +40,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 					         !string.IsNullOrEmpty(player.IpAddress) && player is
 						         { IsBot: false, Connected: PlayerConnectedState.PlayerConnected }))
 			{
+				GPlayersKnivesPickup[player.Slot] = 0;
 				var playerInfo = new PlayerInfo
 				{
 					UserId = player.UserId,

WeaponSynchronization.cs

@@ -3,7 +3,6 @@ using MySqlConnector;
 using System.Collections.Concurrent;
 using CounterStrikeSharp.API.Modules.Utils;
 
-
 namespace WeaponPaints;
 
 internal class WeaponSynchronization
@@ -566,7 +565,6 @@ internal class WeaponSynchronization
 	internal async Task SyncStatTrakToDatabase(PlayerInfo player)
 	{
 	    if (WeaponPaints.WeaponSync == null || WeaponPaints.GPlayerWeaponsInfo.IsEmpty) return;
-
 	    if (string.IsNullOrEmpty(player.SteamId))
 	        return;
 
@@ -578,7 +576,7 @@ internal class WeaponSynchronization
 	        // Check if player's slot exists in GPlayerWeaponsInfo
 	        if (!WeaponPaints.GPlayerWeaponsInfo.TryGetValue(player.Slot, out var teamWeaponsInfo))
 	            return;
-
+	        
 	        // Iterate through each team in the player's weapon info
 	        foreach (var teamInfo in teamWeaponsInfo)
 	        {
@@ -587,27 +585,33 @@ internal class WeaponSynchronization
 
 	            // Get StatTrak weapons for the current team
 	            var statTrakWeapons = weaponInfos
-	                .Where(w => w.Value is { StatTrak: true, StatTrakCount: > 0 })
+		            .ToDictionary(
-	                .ToDictionary(w => w.Key, w => w.Value.StatTrakCount);
+			            w => w.Key, 
+			            w => (w.Value.StatTrak, w.Value.StatTrakCount) // Store both StatTrak and StatTrakCount in a tuple
+		            );
 
 	            // Check if there are StatTrak weapons to sync
 	            if (statTrakWeapons.Count == 0) continue;
-
+	            
 	            // Get the current team ID
 	            int weaponTeam = (int)teamInfo.Key;
 
 	            // Sync StatTrak values for the current team
-	            foreach (var (defindex, statTrakCount) in statTrakWeapons)
+	            foreach (var (defindex, (statTrak, statTrakCount)) in statTrakWeapons)
 	            {
-	                const string query = @"
+		            const string query = @"
-	                    INSERT INTO `wp_player_skins` (`steamid`, `weapon_defindex`, `weapon_stattrak_count`, `weapon_team`) 
+					    UPDATE `wp_player_skins` 
-	                    VALUES (@steamid, @weaponDefIndex, @StatTrakCount, @weaponTeam) 
+					    SET `weapon_stattrak` = @StatTrak, 
-	                    ON DUPLICATE KEY UPDATE `weapon_stattrak_count` = @StatTrakCount";
+					        `weapon_stattrak_count` = @StatTrakCount
+					    WHERE `steamid` = @steamid 
+					      AND `weapon_defindex` = @weaponDefIndex
+					      AND `weapon_team` = @weaponTeam";
 
 	                var parameters = new
 	                {
 	                    steamid = player.SteamId,
 	                    weaponDefIndex = defindex,
+	                    StatTrak = statTrak,
 	                    StatTrakCount = statTrakCount,
 	                    weaponTeam
 	                };

lang/en.json

@@ -24,5 +24,7 @@
 	"wp_skin_menu_skin_title": "Select skin for {lime}{0}{default}",
 	"wp_skin_menu_select": "You have chosen {lime}{0}{default} as your skin",
 
+	"wp_stattrak_action": "You have successfully changed the stattrak setting",
+	
 	"None": "None"
 }

lang/lv.json

@@ -23,6 +23,8 @@
 	"wp_skin_menu_weapon_title": "Ieroču Izvēlne",
 	"wp_skin_menu_skin_title": "Izvēlieties ādu priekš {lime}{0}{default}",
 	"wp_skin_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu ādu",
-
+	
+	"wp_stattrak_action": "Jūs veiksmīgi mainījāt stattrak iestatījumu",
+	
 	"None": "Nav"
 }

lang/pl.json

@@ -24,5 +24,7 @@
 	"wp_skin_menu_skin_title": "Wybierz skórkę dla {lime}{0}{default}",
 	"wp_skin_menu_select": "Wybrałeś {lime}{0}{default} jako swoją skórkę",
 
+	"wp_stattrak_action": "Pomyślnie zmieniłeś ustawienie stattraka",
+	
 	"None": "Brak"
 }

lang/pt-BR.json

@@ -24,5 +24,7 @@
 	"wp_skin_menu_skin_title": "Selecione a skin para {lime}{0}{default}",
 	"wp_skin_menu_select": "Você escolheu {lime}{0}{default} como sua skin",
 
+	"wp_stattrak_action": "Você alterou a configuração de stattrak com sucesso",
+	
 	"None": "Nenhum"
 }

lang/pt-PT.json

@@ -24,5 +24,7 @@
 	"wp_skin_menu_skin_title": "Selecione a skin para {lime}{0}{default}",
 	"wp_skin_menu_select": "Escolheu {lime}{0}{default} como a sua skin",
 
+	"wp_stattrak_action": "Alterou com sucesso a configuração do stattrak",
+	
 	"None": "Nenhum"
 }

lang/ru.json

@@ -24,5 +24,7 @@
 	"wp_skin_menu_skin_title": "Выберите скин для {lime}{0}{default}",
 	"wp_skin_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего скина",
 
+	"wp_stattrak_action": "Вы успешно изменили настройки статтрак",
+	
 	"None": "Нет"
 }

lang/tr.json

@@ -24,5 +24,7 @@
 	"wp_skin_menu_skin_title": "{lime}{0}{default} için cilt seçin",
 	"wp_skin_menu_select": "{lime}{0}{default} olarak cildinizi seçtiniz",
 
+	"wp_stattrak_action": "StatTrak ayarını başarıyla değiştirdiniz",
+	
 	"None": "Hiçbiri"
 }

lang/ua.json

@@ -24,5 +24,7 @@
 	"wp_skin_menu_skin_title": "Виберіть шкіру для {lime}{0}{default}",
 	"wp_skin_menu_select": "Ви обрали {lime}{0}{default} як свою шкіру",
 
+	"wp_stattrak_action": "Ви успішно змінили налаштування статтрака",
+	
 	"None": "Немає"
 }

lang/zh-cn.json

@@ -24,5 +24,7 @@
 	"wp_skin_menu_skin_title": "选择 {lime}{0}{default} 的皮肤",
 	"wp_skin_menu_select": "您选择了 {lime}{0}{default} 作为您的皮肤",
 
+	"wp_stattrak_action": "您已成功更改 StatTrak 设置",
+	
 	"None": "无"
 }