123

Some fixes

.github/workflows/build.yml

@@ -63,11 +63,7 @@ jobs:
     - name: Copy gloves.json
       run: cp website/data/gloves.json ${{ env.OUTPUT_PATH }}/gloves.json
     - name: Zip
-      uses: thedoctor0/zip-release@0.7.5
-      with:
-        type: 'zip'
-        filename: '${{ env.PROJECT_NAME }}.zip'
-        path: ${{ env.OUTPUT_PATH }}
+      run: zip -r "${{ env.PROJECT_NAME }}.zip" "${{ env.OUTPUT_PATH }}" gamedata/
     - name: Clean files Website
       run: |
         rm -rf website/img/

Commands.cs

@@ -1,6 +1,8 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Menu;
+using Newtonsoft.Json.Linq;
+using System.Text;
 
 namespace WeaponPaints
 {
@@ -12,40 +14,52 @@ namespace WeaponPaints
 			if (!Utility.IsPlayerValid(player)) return;
 
 			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
-
-			int playerIndex = (int)player!.Index;
-
-			PlayerInfo playerInfo = new PlayerInfo
-			{
-				UserId = player.UserId,
-				Index = (int)player.Index,
-				SteamId = player?.SteamID.ToString(),
-				Name = player?.PlayerName,
-				IpAddress = player?.IpAddress?.Split(":")[0]
-			};
-
-			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
-
+            PlayerInfo playerInfo = new (
+                (int)player.Index,
+                player.Slot,
+                player.UserId,
+                player.SteamID.ToString(),
+                player.PlayerName,
+                player.IpAddress?.Split(":")[0]
+            );
 			try
 			{
-				if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
-	DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+				if (player != null && !commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
+	player != null && DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
-					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+					commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
 
 					if (weaponSync != null)
-						Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+					{
+						var weaponTasks = new List<Task>();
 
-					if (Config.Additional.GloveEnabled && weaponSync != null)
-						Task.Run(async () => await weaponSync.GetGloveFromDatabase(playerInfo));
+						weaponTasks.Add(Task.Run(async () =>
+						{
+							await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+						}));
+
+						if (Config.Additional.GloveEnabled)
+						{
+							weaponTasks.Add(Task.Run(async () =>
+							{
+								await weaponSync.GetGloveFromDatabase(playerInfo);
+							}));
+						}
 
 						if (Config.Additional.KnifeEnabled)
 						{
-						if (weaponSync != null)
-							Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
+							weaponTasks.Add(Task.Run(async () =>
+							{
+								await weaponSync.GetKnifeFromDatabase(playerInfo);
+							}));
+						}
 
+						Task.WaitAll(weaponTasks.ToArray());
+
+						RefreshGloves(player);
 						RefreshWeapons(player);
 					}
+
 					if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
 					{
 						player!.Print(Localizer["wp_command_refresh_done"]);
@@ -96,7 +110,7 @@ namespace WeaponPaints
 			});
 			AddCommand($"css_{Config.Additional.CommandRefresh}", "Skins refresh", (player, info) =>
 			{
-				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
+				if (!Utility.IsPlayerValid(player)) return;
 				OnCommandRefresh(player, info);
 			});
 			if (Config.Additional.CommandKillEnabled)
@@ -114,18 +128,44 @@ namespace WeaponPaints
         {
             if (!Config.Additional.KnifeEnabled || !g_bCommandsAllowed) return;
 
-			var knivesOnly = weaponList
+            var knivesOnly = GetKnivesOnly();
+            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);
+        }
 
-			var giveItemMenu = new ChatMenu(Localizer["wp_knife_menu_title"]);
-			var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
+        private void AddMenuOptions(ChatMenu giveItemMenu, Dictionary<string, string> knivesOnly)
+        {
+            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"]))
             {
@@ -136,38 +176,46 @@ namespace WeaponPaints
             {
                 player!.Print(Localizer["wp_knife_menu_kill"]);
             }
+        }
 
-					PlayerInfo playerInfo = new PlayerInfo
+        private void SetPlayerKnife(CCSPlayerController player, string knifeKey)
+        {
+            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,
                 Index = (int)player.Index,
                 SteamId = player.SteamID.ToString(),
                 Name = player.PlayerName,
                 IpAddress = player.IpAddress?.Split(":")[0]
             };
-
-					g_playersKnife[(int)player!.Index] = knifeKey;
-
-					if (g_bCommandsAllowed && (LifeState_t)player.LifeState == LifeState_t.LIFE_ALIVE)
-						AddTimer(0.15f, () => RefreshWeapons(player), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
-
-					_ = weaponSync?.SyncKnifeToDatabase(playerInfo, knifeKey) ?? Task.CompletedTask;
         }
-			};
-			foreach (var knifePair in knivesOnly)
+
+        private void AddCommandToOpenKnifeMenu(ChatMenu giveItemMenu)
         {
-				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 (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
-					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+                if (IsCommandAllowed(player))
                 {
-					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+                    commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
                     giveItemMenu.PostSelectAction = PostSelectAction.Close;
                     MenuManager.OpenChatMenu(player, giveItemMenu);
                     return;
@@ -179,17 +227,35 @@ 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"]);
 
-			// Function to handle skin selection for a specific weapon
-			var handleWeaponSelection = (CCSPlayerController? player, ChatMenuOption option) =>
+            // Add weapon options to the weapon selection menu
+            foreach (var weaponClass in weaponList.Keys)
+            {
+                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;
 
-				int playerIndex = (int)player!.Index;
             string selectedWeapon = option.Text;
             if (classNamesByWeapon.TryGetValue(selectedWeapon, out string? selectedWeaponClassname))
             {
@@ -203,15 +269,35 @@ namespace WeaponPaints
                 var skinSubMenu = new ChatMenu(Localizer["wp_skin_menu_skin_title", selectedWeapon]);
                 skinSubMenu.PostSelectAction = PostSelectAction.Close;
 
-					// Function to handle skin selection for the chosen weapon
-					var handleSkinSelection = (CCSPlayerController p, ChatMenuOption opt) =>
+                // 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))
+                            {
+                                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;
 
-						playerIndex = (int)p.Index;
-
             string steamId = p.SteamID.ToString();
-						var firstSkin = skinsList?.FirstOrDefault(skin =>
+            var firstSkin = skinsList?.Find(skin =>
             {
                 if (skin != null && skin.TryGetValue("weapon_name", out var weaponName))
                 {
@@ -228,6 +314,14 @@ 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)
             {
@@ -240,79 +334,36 @@ 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[playerIndex].ContainsKey(weaponDefIndex))
-							{
-								gPlayerWeaponsInfo[playerIndex][weaponDefIndex] = new WeaponInfo();
         }
 
-							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Paint = paintID;
-							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Wear = 0.01f;
-							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Seed = 0;
-
-							PlayerInfo playerInfo = new PlayerInfo
+        private void UpdatePlayerWeaponInfo(CCSPlayerController p, int weaponDefIndex, int paintID)
         {
-								UserId = p.UserId,
-								Index = (int)p.Index,
-								SteamId = p.SteamID.ToString(),
-								Name = p.PlayerName,
-								IpAddress = p.IpAddress?.Split(":")[0]
-							};
+            if (!gPlayerWeaponsInfo[p.Slot].TryGetValue(weaponDefIndex, out WeaponInfo? value))
+            {
+                value = new WeaponInfo();
+                gPlayerWeaponsInfo[p.Slot][weaponDefIndex] = value;
+            }
+
+            value.Paint = paintID;
+            value.Wear = 0.00f;
+            value.Seed = 0;
 
             if (g_bCommandsAllowed && (LifeState_t)p.LifeState == LifeState_t.LIFE_ALIVE)
-								AddTimer(0.15f, () => RefreshWeapons(p), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
-
-
-							if (!Config.GlobalShare)
             {
-								if (weaponSync != null)
-									Task.Run(async () => await weaponSync.SyncWeaponPaintsToDatabase(playerInfo));
-							}
-						}
-					};
-
-					// 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);
-								}
-							}
+                RefreshWeapons(p);
             }
         }
 
-					// Open the submenu for skin selection of the chosen weapon
-					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) =>
+        private void OpenWeaponSelectionMenu(CCSPlayerController? player, ChatMenu weaponSelectionMenu)
         {
             if (!Utility.IsPlayerValid(player)) return;
 
             if (player == null || player.UserId == null) return;
 
-						if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
-					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+            if (player != null && !commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
+                player != null && DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
             {
-							commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
+                commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
                 MenuManager.OpenChatMenu(player, weaponSelectionMenu);
                 return;
             }
@@ -320,30 +371,35 @@ namespace WeaponPaints
             {
                 player!.Print(Localizer["wp_command_cooldown"]);
             }
-					});
         }
-
         private void SetupGlovesMenu()
         {
             var glovesSelectionMenu = new ChatMenu(Localizer["wp_glove_menu_title"]);
+            glovesSelectionMenu.PostSelectAction = PostSelectAction.Close;
 
             var handleGloveSelection = (CCSPlayerController? player, ChatMenuOption option) =>
             {
-				if (!Utility.IsPlayerValid(player)) return;
+                if (!Utility.IsPlayerValid(player) || player is null) return;
 
-				uint playerIndex = player!.Index;
                 string selectedPaintName = option.Text;
-
                 var selectedGlove = glovesList.FirstOrDefault(g => g.ContainsKey("paint_name") && g["paint_name"]?.ToString() == selectedPaintName);
                 if (selectedGlove != null)
                 {
-					if (
-						selectedGlove != null &&
+                    HandleSelectedGlove(player, selectedGlove, selectedPaintName);
+                }
+            };
+
+            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)
                 {
@@ -351,32 +407,60 @@ namespace WeaponPaints
                     PlayerWeaponImage[player.Slot] = image;
                     AddTimer(2.0f, () => PlayerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
                 }
-
-						PlayerInfo playerInfo = new PlayerInfo
-						{
-							UserId = player.UserId,
-							Index = (int)player.Index,
-							SteamId = player.SteamID.ToString(),
-							Name = player.PlayerName,
-							IpAddress = player.IpAddress?.Split(":")[0]
-						};
+                PlayerInfo playerInfo = new(
+                    (int)player.Index,
+                    player.Slot,
+                    player.UserId,
+                    player.SteamID.ToString(),
+                    player.PlayerName,
+                    player.IpAddress?.Split(":")[0]
+                );
 
                 if (paint != 0)
-							g_playersGlove[playerIndex] = ((ushort)weaponDefindex, paint);
+                {
+                    g_playersGlove[player.Slot] = (ushort)weaponDefindex;
+
+                    if (!gPlayerWeaponsInfo[player.Slot].TryGetValue(weaponDefindex, out _))
+                    {
+                        WeaponInfo weaponInfo = new();
+                        weaponInfo.Paint = paint;
+                        gPlayerWeaponsInfo[player.Slot][weaponDefindex] = weaponInfo;
+                    }
+                }
                 else
-							g_playersGlove.TryRemove(playerIndex, out _);
+                {
+                    g_playersGlove.TryRemove(player.Slot, out _);
+                }
 
                 if (!string.IsNullOrEmpty(Localizer["wp_glove_menu_select"]))
                 {
                     player!.Print(Localizer["wp_glove_menu_select", selectedPaintName]);
                 }
 
-						_ = weaponSync?.SyncGloveToDatabase(playerInfo, (ushort)weaponDefindex, paint) ?? Task.CompletedTask;
-					}
-				};
-			};
+                if (weaponSync != null)
+                {
+                    Task.Run(async () =>
+                    {
+                        await weaponSync.SyncGloveToDatabase(playerInfo, weaponDefindex);
 
-			// Add weapon options to the weapon selection menu
+                        if (!gPlayerWeaponsInfo[playerInfo.Slot].TryGetValue(weaponDefindex, out var weaponInfo))
+                        {
+                            weaponInfo = new WeaponInfo();
+                            gPlayerWeaponsInfo[playerInfo.Slot][weaponDefindex] = weaponInfo;
+                        }
+
+                        weaponInfo.Paint = paint;
+                        weaponInfo.Wear = 0.00f;
+                        weaponInfo.Seed = 0;
+
+                    });
+                }
+                RefreshGloves(player);
+            }
+        }
+
+        private void AddGloveOptionsToMenu(ChatMenu glovesSelectionMenu, Action<CCSPlayerController?, ChatMenuOption> handleGloveSelection)
+        {
             foreach (var gloveObject in glovesList)
             {
                 string paintName = gloveObject["paint_name"]?.ToString() ?? "";
@@ -384,19 +468,20 @@ namespace WeaponPaints
                 if (paintName.Length > 0)
                     glovesSelectionMenu.AddMenuOption(paintName, handleGloveSelection);
             }
+        }
 
-			// Command to open the weapon selection menu for players
+        private void AddCommandToOpenGloveSelectionMenu(ChatMenu glovesSelectionMenu)
+        {
             AddCommand($"css_{Config.Additional.CommandGlove}", "Gloves selection menu", (player, info) =>
             {
-						if (!Utility.IsPlayerValid(player)) return;
+                if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
 
                 if (player == null || player.UserId == null) return;
 
-						if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
-					DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+                if (player != null && !commandsCooldown.TryGetValue(player.Slot, out DateTime cooldownEndTime) ||
+                    player != null && DateTime.UtcNow >= (commandsCooldown.TryGetValue(player.Slot, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
                 {
-							commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-							glovesSelectionMenu.PostSelectAction = PostSelectAction.Close;
+                    commandsCooldown[player.Slot] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
                     MenuManager.OpenChatMenu(player, glovesSelectionMenu);
                     return;
                 }

Config.cs

@@ -73,9 +73,6 @@ namespace WeaponPaints
 		[JsonPropertyName("DatabaseName")]
 		public string DatabaseName { get; set; } = "";
 
-		[JsonPropertyName("GlobalShare")]
-		public bool GlobalShare { get; set; } = false;
-
 		[JsonPropertyName("CmdRefreshCooldownSeconds")]
 		public int CmdRefreshCooldownSeconds { get; set; } = 60;
 

Database.cs

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

Events.cs

@@ -1,56 +1,95 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
 
 namespace WeaponPaints
 {
 	public partial class WeaponPaints
 	{
-		private void OnClientPutInServer(int playerSlot)
+		[GameEventHandler]
+		public HookResult OnClientFullConnect(EventPlayerConnectFull @event, GameEventInfo info)
 		{
-			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
+			CCSPlayerController? player = @event.Userid;
 
 			if (player is null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID.ToString().Length != 17 ||
-				weaponSync == null) return;
+				weaponSync == null || _database == null) return HookResult.Continue;
 
-			PlayerInfo playerInfo = new PlayerInfo
-			{
-				UserId = player.UserId,
-				Index = (int)player.Index,
-				SteamId = player.SteamID.ToString(),
-				Name = player.PlayerName,
-				IpAddress = player.IpAddress?.Split(":")[0]
-			};
+            PlayerInfo playerInfo = new(
+                (int)player.Index,
+                player.Slot,
+                player.UserId,
+                player.SteamID.ToString(),
+                player.PlayerName,
+                player.IpAddress?.Split(":")[0]
+            );
 
-			Task.Run(async () =>
+            try
 			{
 				if (Config.Additional.SkinEnabled)
-					await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
-
+				{
+					Task.Run(() => weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+				}
 				if (Config.Additional.KnifeEnabled)
-					await weaponSync.GetKnifeFromDatabase(playerInfo);
+				{
+					Task.Run(() => weaponSync.GetKnifeFromDatabase(playerInfo));
+				}
 				if (Config.Additional.GloveEnabled)
-					await weaponSync.GetGloveFromDatabase(playerInfo);
+				{
+					Task.Run(() => weaponSync.GetGloveFromDatabase(playerInfo));
+				}
+			}
+			catch (Exception ex)
+			{
+				Console.WriteLine($"An error occurred: {ex.Message}");
+			}
+
+			return HookResult.Continue;
+		}
+
+		[GameEventHandler]
+		public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo info)
+		{
+			CCSPlayerController player = @event.Userid;
+
+			if (player is null || !player.IsValid || player.IsBot ||
+				player.IsHLTV || player.SteamID.ToString().Length != 17) return HookResult.Continue;
+
+            PlayerInfo playerInfo = new(
+                (int)player.Index,
+                player.Slot,
+                player.UserId,
+                player.SteamID.ToString(),
+                player.PlayerName,
+                player.IpAddress?.Split(":")[0]
+            );
+
+            if (weaponSync != null)
+			{
+				// Run weapon sync tasks asynchronously
+				Task.Run(async () =>
+				{
+					await weaponSync.SyncWeaponPaintsToDatabase(playerInfo);
 				});
-		}
 
-		private void OnClientDisconnect(int playerSlot)
+				// Remove player data
+				if (Config.Additional.SkinEnabled)
 				{
-			CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
-
-			if (player is null || !player.IsValid || !player.UserId.HasValue || player.IsBot || player.IsHLTV || player.SteamID.ToString().Length != 17) return;
-
+					gPlayerWeaponsInfo.TryRemove(player.Slot, out _);
+				}
 				if (Config.Additional.KnifeEnabled)
-				g_playersKnife.TryRemove((int)player.Index, out _);
-			if (Config.Additional.GloveEnabled)
-				g_playersGlove.TryRemove(player.Index, out _);
-
-			if (Config.Additional.SkinEnabled && gPlayerWeaponsInfo.TryGetValue((int)player.Index, out var innerDictionary))
 				{
-				innerDictionary.Clear();
-				gPlayerWeaponsInfo.TryRemove((int)player.Index, out _);
+					g_playersKnife.TryRemove(player.Slot, out _);
+				}
+				if (Config.Additional.GloveEnabled)
+				{
+					g_playersGlove.TryRemove(player.Slot, out _);
+				}
 			}
 
-			commandsCooldown.Remove((int)player.UserId);
+			// Remove player's command cooldown
+			commandsCooldown.Remove(player.Slot);
+
+			return HookResult.Continue;
 		}
 
 		private void OnEntityCreated(CEntityInstance entity)
@@ -75,8 +114,7 @@ namespace WeaponPaints
 					if (weapon.OwnerEntity.Value == null) return;
 					if (weapon.OwnerEntity.Index <= 0) return;
 					int weaponOwner = (int)weapon.OwnerEntity.Index;
-					CBasePlayerPawn? pawn = Utilities.GetEntityFromIndex<CCSPlayerPawn>((int)weaponOwner);
-					//var pawn = new CBasePlayerPawn(NativeAPI.GetEntityFromIndex(weaponOwner));
+					CBasePlayerPawn? pawn = Utilities.GetEntityFromIndex<CCSPlayerPawn>(weaponOwner);
 					if (!pawn.IsValid) return;
 
 					var playerIndex = (int)pawn.Controller.Index;
@@ -91,11 +129,14 @@ namespace WeaponPaints
 
 		public HookResult OnPickup(CEntityIOOutput output, string name, CEntityInstance activator, CEntityInstance caller, CVariant value, float delay)
 		{
+			if (!Config.Additional.GiveKnifeAfterRemove)
+				return HookResult.Continue;
+
 			CCSPlayerController? player = Utilities.GetEntityFromIndex<CCSPlayerPawn>((int)activator.Index).OriginalController.Value;
 
 			if (player == null || player.IsBot || player.IsHLTV ||
-				player.SteamID.ToString().Length != 17 || !g_knifePickupCount.TryGetValue((int)player.Index, out var pickupCount) ||
-				!g_playersKnife.ContainsKey((int)player.Index))
+				player.SteamID.ToString().Length != 17 || !g_knifePickupCount.TryGetValue(player.Slot, out var pickupCount) ||
+				!g_playersKnife.ContainsKey(player.Slot))
 			{
 				return HookResult.Continue;
 			}
@@ -112,18 +153,12 @@ namespace WeaponPaints
 				return HookResult.Continue;
 			}
 
-			if (g_playersKnife[(int)player.Index] != "weapon_knife")
+			if (g_playersKnife[player.Slot] != "weapon_knife")
 			{
 				pickupCount++;
-				g_knifePickupCount[(int)player.Index] = pickupCount;
+				g_knifePickupCount[player.Slot] = pickupCount;
 
-				if (Config.Additional.GiveKnifeAfterRemove)
-				{
-					AddTimer(0.10f, () =>
-					{
-						RefreshWeapons(player);
-					});
-				}
+				AddTimer(0.2f, () => RefreshWeapons(player));
 			}
 
 			return HookResult.Continue;
@@ -134,7 +169,7 @@ namespace WeaponPaints
 			if (!Config.Additional.KnifeEnabled && !Config.Additional.SkinEnabled && !Config.Additional.GloveEnabled) return;
 
 			if (_database != null)
-				weaponSync = new WeaponSynchronization(_database, Config, GlobalShareApi, GlobalShareServerId);
+				weaponSync = new WeaponSynchronization(_database, Config);
 
 			// TODO
 			// needed for now
@@ -143,9 +178,6 @@ namespace WeaponPaints
 				NativeAPI.IssueServerCommand("mp_t_default_melee \"\"");
 				NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
 				NativeAPI.IssueServerCommand("mp_equipment_reset_rounds 0");
-
-				if (Config.GlobalShare)
-					GlobalShareConnect();
 			});
 		}
 
@@ -156,26 +188,15 @@ namespace WeaponPaints
 			if (player is null || !player.IsValid || !Config.Additional.KnifeEnabled && !Config.Additional.GloveEnabled)
 				return HookResult.Continue;
 
-			if (g_playersGlove.TryGetValue(player.Index, out var gloveInfo) && gloveInfo.Paint != 0)
-			{
-				player.PlayerPawn!.Value!.EconGloves.ItemDefinitionIndex = gloveInfo.Definition;
-				player.PlayerPawn!.Value!.EconGloves.ItemIDLow = 16384 & 0xFFFFFFFF;
-				player.PlayerPawn!.Value!.EconGloves.ItemIDHigh = 16384 >> 32;
-				player.PlayerPawn!.Value!.EconGloves.EntityQuality = 3;
-				player.PlayerPawn!.Value!.EconGloves.EntityLevel = 1;
+			g_knifePickupCount[player.Slot] = 0;
+
+			if (!PlayerHasKnife(player))
+				GiveKnifeToPlayer(player);
 
 			Server.NextFrame(() =>
 			{
-					player.PlayerPawn!.Value!.EconGloves.Initialized = true;
-					SetPlayerBody(player, "default_gloves", 1);
-					SetOrAddAttributeValueByName(player.PlayerPawn!.Value!.EconGloves.NetworkedDynamicAttributes, "set item texture prefab", gloveInfo.Paint);
-
-					Utilities.SetStateChanged(player.PlayerPawn.Value, "CCSPlayerPawn", "m_EconGloves");
+				RefreshGloves(player);
 			});
-			}
-
-			g_knifePickupCount[(int)player.Index] = 0;
-			GiveKnifeToPlayer(player);
 
 			return HookResult.Continue;
 		}
@@ -183,6 +204,7 @@ namespace WeaponPaints
 		private HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
 		{
 			g_bCommandsAllowed = false;
+
 			return HookResult.Continue;
 		}
 
@@ -196,17 +218,17 @@ namespace WeaponPaints
 
 			return HookResult.Continue;
 		}
-
 		private void OnTick()
 		{
-			foreach (var player in Utilities.GetPlayers())
+			foreach (var player in Utilities.GetPlayers().Where(p =>
+							p is not null && p.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
+							)
+				)
 			{
 				try
 				{
-					if (player is null || !player.IsValid || !player.PawnIsAlive || player.SteamID.ToString().Length != 17
-						|| player.IsBot || player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
-						continue;
-
 					if (Config.Additional.ShowSkinImage && PlayerWeaponImage.ContainsKey(player.Slot) && !string.IsNullOrEmpty(PlayerWeaponImage[player.Slot]))
 					{
 						player.PrintToCenterHtml("<img src='{PATH}'</img>".Replace("{PATH}", PlayerWeaponImage[player.Slot]));
@@ -238,19 +260,27 @@ namespace WeaponPaints
 					if (skeleton == null)
 						continue;
 
+					bool skeletonChange = false;
+
 					int[] newPaints = { 1171, 1170, 1169, 1164, 1162, 1161, 1159, 1175, 1174, 1167, 1165, 1168, 1163, 1160, 1166, 1173 };
 					if (newPaints.Contains(weapon.FallbackPaintKit))
+					{
+						if (skeleton.ModelState.MeshGroupMask != 1)
 						{
 							skeleton.ModelState.MeshGroupMask = 1;
+							skeletonChange = true;
+						}
 					}
 					else
 					{
 						if (skeleton.ModelState.MeshGroupMask != 2)
 						{
 							skeleton.ModelState.MeshGroupMask = 2;
+							skeletonChange = true;
 						}
 					}
 
+					if (skeletonChange)
 						Utilities.SetStateChanged(viewModel.Value, "CBaseEntity", "m_CBodyComponent");
 				}
 				catch (Exception)
@@ -261,9 +291,9 @@ namespace WeaponPaints
 
 		private void RegisterListeners()
 		{
-			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
-			RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
-			RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
+			RegisterListener<Listeners.OnEntitySpawned>(OnEntityCreated);
+			//RegisterListener<Listeners.OnClientPutInServer>(OnClientPutInServer);
+			//RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
 			RegisterListener<Listeners.OnTick>(OnTick);
 

PlayerExtensions.cs

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

PlayerInfo.cs

@@ -3,9 +3,22 @@
     public class PlayerInfo
     {
         public int Index { get; set; }
+        public int Slot { get; set; }
         public int? UserId { get; set; }
         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;
+        }
     }
 }

README.md

@@ -10,7 +10,7 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 
 ## Features
 - Changes only paint, seed and wear on weapons and knives
-- MySQL based or global website, so you dont need MySQL/Website
+- MySQL based
 - Data syncs on player connect
 - Added command **`!wp`** to refresh skins ***(with cooldown in seconds can be configured)***
 - Added command **`!ws`** to show website
@@ -18,13 +18,11 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 - Knife change is now limited to have these cvars empty **`mp_t_default_melee ""`** and **`mp_ct_default_melee ""`**
 - Translations support, submit a PR if you want to share your translation
 
-**GlobalShare** - global website accessible at [weaponpaints.fun](https://weaponpaints.fun/)
-
 ## CS2 Server
 - Have working CounterStrikeSharp (**with RUNTIME!**)
 - Download from Release and copy plugin to plugins
 - Run server with plugin, **it will generate config if installed correctly!**
-- Edit `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
+- Edit `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** include database credentials
 - In `addons/counterstrikesharp/configs/`**`core.json`** set **FollowCS2ServerGuidelines** to **`false`**
 
 ## Plugin Configuration
@@ -32,12 +30,11 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
   <summary>Click to expand</summary>
 <code><pre>{
 	"Version": 4, // Don't touch
-	"DatabaseHost": "", // MySQL host (required if GlobalShare = false)
-	"DatabasePort": 3306, // MySQL port (required if GlobalShare = false)
-	"DatabaseUser": "", // MySQL username (required if GlobalShare = false)
-	"DatabasePassword": "", // MySQL user password (required if GlobalShare = false)
-	"DatabaseName": "", // MySQL database name (required if GlobalShare = false)
-	"GlobalShare": false, // Enable or disable GlobalShare, plugin can work without mysql credentials but with shared website at weaponpaints.fun
+	"DatabaseHost": "", // MySQL host
+	"DatabasePort": 3306, // MySQL port
+	"DatabaseUser": "", // MySQL username
+	"DatabasePassword": "", // MySQL user password
+	"DatabaseName": "", // MySQL database name
 	"CmdRefreshCooldownSeconds": 60, // Cooldown time in refreshing skins (!wp command)
 	"Prefix": "[WeaponPaints]", // Prefix every chat message
 	"Website": "example.com/skins", // Website used in WebsiteMessageCommand (!ws command)
@@ -74,7 +71,6 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 </details>
     
 ## Web install
-Disregard if the config is **`GlobalShare = true`**
 - Requires PHP >= 7.4 ***(Tested on php ver **`8.2.3`** and nginx webserver)***
 - **Before using website, make sure the plugin is correctly loaded in cs2 server!** Mysql tables are created by plugin not by website.
 - Copy website to web server ***(Folder `img` not needed)***

SchemaString.cs

@@ -13,12 +13,13 @@ 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.ToInt64() + i), bytes[i]);
+            Unsafe.Write((void*)(handle + i), bytes[i]);
         }
 
-		Unsafe.Write((void*)(Handle.ToInt64() + bytes.Length), 0);
+        Unsafe.Write((void*)(handle + bytes.Length), 0);
     }
 }

Utility.cs

@@ -58,11 +58,17 @@ namespace WeaponPaints
 						@"CREATE TABLE IF NOT EXISTS `wp_player_gloves` (
 							 `steamid` varchar(64) NOT NULL,
 							 `weapon_defindex` int(11) NOT NULL,
-					 `paint` int(11) NOT NULL,
 							  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);
@@ -86,8 +92,8 @@ namespace WeaponPaints
 		{
 			if (player is null) return false;
 
-			return (player is not null && player.IsValid && !player.IsBot && !player.IsHLTV
-				&& WeaponPaints.weaponSync != null && player.Connected == PlayerConnectedState.PlayerConnected);
+			return (player is not null && player.IsValid && !player.IsBot && !player.IsHLTV && player.UserId.HasValue
+				&& WeaponPaints.weaponSync != null && player.Connected == PlayerConnectedState.PlayerConnected && player.SteamID.ToString().Length == 17);
 		}
 
 		internal static void LoadSkinsFromFile(string filePath)

VERSION

@@ -1 +1 @@
-1.8a
+1.9b

WeaponAction.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Timers;
 using CounterStrikeSharp.API.Modules.Utils;
 using Microsoft.Extensions.Logging;
 using System.Runtime.InteropServices;
@@ -12,12 +13,9 @@ 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;
 
-			int playerIndex = (int)player.Index;
-
-			if (!gPlayerWeaponsInfo.ContainsKey(playerIndex)) return;
-
-			if (isKnife && !g_playersKnife.ContainsKey(playerIndex) || isKnife && g_playersKnife[playerIndex] == "weapon_knife") return;
+			if (isKnife && !g_playersKnife.ContainsKey(player.Slot) || isKnife && g_playersKnife[player.Slot] == "weapon_knife") return;
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
@@ -29,7 +27,7 @@ namespace WeaponPaints
 			int fallbackPaintKit = weapon.FallbackPaintKit;
 
 			if (_config.Additional.GiveRandomSkin &&
-				 !gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
+				 !gPlayerWeaponsInfo[player.Slot].ContainsKey(weaponDefIndex))
 			{
 				// Random skins
 				weapon.AttributeManager.Item.ItemID = 16384;
@@ -86,8 +84,8 @@ namespace WeaponPaints
 				return;
 			}
 
-			if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex)) return;
-			WeaponInfo weaponInfo = gPlayerWeaponsInfo[playerIndex][weaponDefIndex];
+			if (!gPlayerWeaponsInfo[player.Slot].ContainsKey(weaponDefIndex)) return;
+			WeaponInfo weaponInfo = gPlayerWeaponsInfo[player.Slot][weaponDefIndex];
 			//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]}");
 			weapon.AttributeManager.Item.ItemID = 16384;
 			weapon.AttributeManager.Item.ItemIDLow = 16384 & 0xFFFFFFFF;
@@ -143,8 +141,10 @@ namespace WeaponPaints
 		{
 			if (!_config.Additional.KnifeEnabled || player == null || !player.IsValid) return;
 
+			WeaponPaints.Instance.AddTimer(1.0f, () =>
+			{
 				string knifeToGive;
-			if (g_playersKnife.TryGetValue((int)player.Index, out var knife))
+				if (g_playersKnife.TryGetValue(player.Slot, out var knife))
 				{
 					knifeToGive = knife;
 				}
@@ -168,13 +168,14 @@ namespace WeaponPaints
 				}
 
 				player.GiveNamedItem(knifeToGive);
+			});
 		}
 
 		internal static bool PlayerHasKnife(CCSPlayerController? player)
 		{
 			if (!_config.Additional.KnifeEnabled) return false;
 
-			if (player == null || !player.IsValid || player.PlayerPawn == null || !player.PlayerPawn.IsValid || !player.PawnIsAlive)
+			if (player == null || !player.IsValid || player.PlayerPawn == null || !player.PlayerPawn.IsValid)
 			{
 				return false;
 			}
@@ -201,21 +202,18 @@ namespace WeaponPaints
 		{
 			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE)
 				return;
-
 			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
 				return;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
+
 			if (weapons == null || weapons.Count == 0)
 				return;
+			if (player.Team == CsTeam.None || player.Team == CsTeam.Spectator)
+				return;
 
-			if (weapons != null && weapons.Count > 0)
-			{
 			//Dictionary<string, (int, int)> weaponsWithAmmo = new Dictionary<string, (int, int)>();
 			Dictionary<string, List<(int, int)>> weaponsWithAmmo = new Dictionary<string, List<(int, int)>>();
-				bool bomb = false;
-				bool defuser = player.PawnHasDefuser;
-				bool healthshot = false;
 
 			// Iterate through each weapon
 			foreach (var weapon in weapons)
@@ -224,31 +222,29 @@ namespace WeaponPaints
 					!weapon.Value.IsValid || !weapon.Value.DesignerName.Contains("weapon_"))
 					continue;
 
+				CCSWeaponBaseGun gun = weapon.Value.As<CCSWeaponBaseGun>();
+
+				if (weapon.Value.Entity == null) continue;
+				if (weapon.Value.OwnerEntity == null) continue;
+				if (!weapon.Value.OwnerEntity.IsValid) continue;
+				if (gun == null) continue;
+				if (gun.Entity == null) continue;
+				if (!gun.IsValid) continue;
+				if (!gun.VisibleinPVS) continue;
+
 				try
 				{
 					string? weaponByDefindex = null;
 
 					CCSWeaponBaseVData? weaponData = weapon.Value.As<CCSWeaponBase>().VData;
 
-						if (weaponData != null)
+					if (weaponData == null) continue;
+
+					if (weaponData.GearSlot == gear_slot_t.GEAR_SLOT_RIFLE || weaponData.GearSlot == gear_slot_t.GEAR_SLOT_PISTOL)
 					{
-							if (weaponData.GearSlot == gear_slot_t.GEAR_SLOT_C4)
-								bomb = true;
+						if (!WeaponDefindex.TryGetValue(weapon.Value.AttributeManager.Item.ItemDefinitionIndex, out weaponByDefindex))
+							continue;
 
-							if (weaponData.Name.Equals("weapon_healtshot"))
-								healthshot = true;
-
-							if (weaponData.GearSlot == gear_slot_t.GEAR_SLOT_GRENADES || weaponData.GearSlot == gear_slot_t.GEAR_SLOT_UTILITY || weaponData.GearSlot == gear_slot_t.GEAR_SLOT_BOOSTS)
-							{
-								int clip1 = weapon.Value.Clip1;
-								int reservedAmmo = weapon.Value.ReserveAmmo[0];
-
-								weaponsWithAmmo.Add(weapon.Value.DesignerName, new List<(int, int)>() { (clip1, reservedAmmo) });
-							}
-						}
-
-						if (!weapon.Value.DesignerName.Contains("knife") && WeaponDefindex.TryGetValue(weapon.Value.AttributeManager.Item.ItemDefinitionIndex, out weaponByDefindex) && weaponByDefindex != null)
-						{
 						int clip1 = weapon.Value.Clip1;
 						int reservedAmmo = weapon.Value.ReserveAmmo[0];
 
@@ -259,6 +255,8 @@ namespace WeaponPaints
 
 						weaponsWithAmmo[weaponByDefindex].Add((clip1, reservedAmmo));
 					}
+
+					//player.RemoveItemByDesignerName(weapon.Value.DesignerName, false);
 				}
 				catch (Exception ex)
 				{
@@ -267,27 +265,36 @@ namespace WeaponPaints
 				}
 			}
 
-				player.RemoveWeapons();
-				AddTimer(0.35f, () =>
+			for (int i = 1; i <= 3; i++)
+			{
+				player.ExecuteClientCommand($"slot {i}");
+				player.ExecuteClientCommand($"slot {i}");
+
+				AddTimer(0.1f, () =>
+				{
+					var weapon = player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value;
+					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;
+
+					player.DropActiveWeapon();
+
+					AddTimer(0.22f, () =>
+					{
+						if (gun != null && gun.IsValid && gun.State == CSWeaponState_t.WEAPON_NOT_CARRIED)
+						{
+							weapon?.Remove();
+						}
+					});
+				});
+			}
+
+			AddTimer(1.2f, () =>
 			{
 				GiveKnifeToPlayer(player);
 
-					if (bomb)
-						player.GiveNamedItem("weapon_c4");
-
-					if (defuser)
-					{
-						var itemServ = player.PlayerPawn?.Value?.ItemServices;
-						if (itemServ != null)
-						{
-							var items = new CCSPlayer_ItemServices(itemServ.Handle);
-							items.HasDefuser = true;
-						}
-					}
-
-					if (healthshot)
-						player.GiveNamedItem("weapon_healtshot");
-
 				foreach (var entry in weaponsWithAmmo)
 				{
 					foreach (var ammo in entry.Value)
@@ -310,16 +317,15 @@ namespace WeaponPaints
 						});
 					}
 				}
-				}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
-			}
+			}, TimerFlags.STOP_ON_MAPCHANGE);
 		}
 
 		internal void RefreshKnife(CCSPlayerController? player)
 		{
-			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE)
+			if (player == null || !player.IsValid || player.PlayerPawn?.Value == null)
 				return;
 
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
+			if (player.PlayerPawn.Value.WeaponServices == null)
 				return;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
@@ -335,8 +341,10 @@ namespace WeaponPaints
 
 							if (weapon.Value.DesignerName.Contains("knife") || weaponData?.GearSlot == gear_slot_t.GEAR_SLOT_KNIFE)
 							{
-								RefreshWeapons(player);
-								break;
+								player.ExecuteClientCommand("slot 3");
+
+								weapon.Value.Remove();
+								GiveKnifeToPlayer(player);
 							}
 						}
 						catch (Exception ex)
@@ -348,6 +356,57 @@ namespace WeaponPaints
 			}
 		}
 
+		private static void RefreshGloves(CCSPlayerController player)
+		{
+			if (!Utility.IsPlayerValid(player) || (LifeState_t)player.LifeState != LifeState_t.LIFE_ALIVE) return;
+
+			CCSPlayerPawn? pawn = player.PlayerPawn.Value;
+			if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
+				return;
+
+			string model = pawn.CBodyComponent?.SceneNode?.GetSkeletonInstance()?.ModelState.ModelName ?? string.Empty;
+			if (!string.IsNullOrEmpty(model))
+			{
+				pawn.SetModel("characters/models/tm_jumpsuit/tm_jumpsuit_varianta.vmdl");
+				pawn.SetModel(model);
+			}
+
+			Instance.AddTimer(0.06f, () =>
+			{
+				try
+				{
+					if (player == null || !player.IsValid)
+						return;
+
+					if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
+						return;
+
+					if (g_playersGlove.TryGetValue(player.Slot, out var gloveInfo) && gloveInfo != 0)
+					{
+						CCSPlayerPawn? pawn = player.PlayerPawn.Value;
+						if (pawn == null || !pawn.IsValid || pawn.LifeState != (byte)LifeState_t.LIFE_ALIVE)
+							return;
+
+						WeaponInfo weaponInfo = gPlayerWeaponsInfo[player.Slot][gloveInfo];
+
+						CEconItemView item = pawn.EconGloves;
+						item.ItemDefinitionIndex = gloveInfo;
+						item.ItemIDLow = 16384 & 0xFFFFFFFF;
+						item.ItemIDHigh = 16384;
+
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture prefab", weaponInfo.Paint);
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture seed", weaponInfo.Seed);
+						CAttributeList_SetOrAddAttributeValueByName.Invoke(item.NetworkedDynamicAttributes.Handle, "set item texture wear", weaponInfo.Wear);
+
+						item.Initialized = true;
+
+						CBaseModelEntity_SetBodygroup.Invoke(pawn, "default_gloves", 1);
+					}
+				}
+				catch (Exception) { }
+			}, TimerFlags.STOP_ON_MAPCHANGE);
+		}
+
 		private static int GetRandomPaint(int defindex)
 		{
 			if (skinsList == null || skinsList.Count == 0)
@@ -375,18 +434,6 @@ namespace WeaponPaints
 			return new CSkeletonInstance(GetSkeletonInstance(node.Handle));
 		}
 
-		public void SetOrAddAttributeValueByName(CAttributeList attr, string name, float f)
-		{
-			var SetAttr = VirtualFunction.Create<IntPtr, string, float, int>("\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x49\\x89\\xFE\\x41\\x55\\x41\\x54\\x49\\x89\\xF4\\x53\\x48\\x83\\xEC\\x78");
-			SetAttr(attr.Handle, name, f);
-		}
-
-		public void SetPlayerBody(CCSPlayerController player, string model, int i)
-		{
-			var SetBody = VirtualFunction.Create<IntPtr, string, int, int>("\\x55\\x48\\x89\\xE5\\x41\\x56\\x49\\x89\\xF6\\x41\\x55\\x41\\x89\\xD5\\x41\\x54\\x49\\x89\\xFC\\x48\\x83\\xEC\\x08");
-			SetBody(player.PlayerPawn.Value!.Handle, model, i);
-		}
-
 		private static unsafe CHandle<CBaseViewModel>[]? GetPlayerViewModels(CCSPlayerController player)
 		{
 			if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.ViewModelServices == null) return null;

WeaponInfo.cs

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

WeaponPaints.cs

@@ -1,7 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
-using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using MySqlConnector;
@@ -10,9 +10,11 @@ using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(167)]
+[MinimumApiVersion(168)]
 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"},
@@ -77,19 +79,20 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	internal static IStringLocalizer? _localizer;
 	internal static Dictionary<int, int> g_knifePickupCount = new Dictionary<int, int>();
 	internal static ConcurrentDictionary<int, string> g_playersKnife = new ConcurrentDictionary<int, string>();
-	internal static ConcurrentDictionary<uint, (ushort Definition, int Paint)> g_playersGlove = new ConcurrentDictionary<uint, (ushort Definition, int Paint)>();
+	internal static ConcurrentDictionary<int, ushort> g_playersGlove = new ConcurrentDictionary<int, ushort>();
 	internal static ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>>();
 	internal static List<JObject> skinsList = new List<JObject>();
 	internal static List<JObject> glovesList = new List<JObject>();
 	internal static WeaponSynchronization? weaponSync;
-	internal bool g_bCommandsAllowed = true;
+	public static bool g_bCommandsAllowed = true;
 	internal Dictionary<int, string> PlayerWeaponImage = new();
 
-	internal Uri GlobalShareApi = new("https://weaponpaints.fun/api.php");
-	internal int GlobalShareServerId = 0;
 	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
 	internal static Database? _database;
 
+	internal static MemoryFunctionVoid<nint, string, float> CAttributeList_SetOrAddAttributeValueByName = new(GameData.GetSignature("CAttributeList_SetOrAddAttributeValueByName"));
+	internal static MemoryFunctionVoid<CBaseModelEntity, string, UInt64> CBaseModelEntity_SetBodygroup = new(GameData.GetSignature("CBaseModelEntity_SetBodygroup"));
+
 	public static Dictionary<int, string> WeaponDefindex { get; } = new Dictionary<int, string>
 	{
 		{ 1, "weapon_deagle" },
@@ -148,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.8a";
+	public override string ModuleVersion => "1.9b";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -162,6 +165,8 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 	public override void Load(bool hotReload)
 	{
+		Instance = this;
+
 		if (hotReload)
 		{
 			OnMapStart(string.Empty);
@@ -172,25 +177,30 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 					player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
 					continue;
 
-				g_knifePickupCount[(int)player.Index] = 0;
-				gPlayerWeaponsInfo.TryRemove((int)player.Index, out _);
-				g_playersKnife.TryRemove((int)player.Index, out _);
+				g_knifePickupCount[(int)player.Slot] = 0;
+				gPlayerWeaponsInfo.TryRemove((int)player.Slot, out _);
+				g_playersKnife.TryRemove((int)player.Slot, out _);
 
-				PlayerInfo playerInfo = new PlayerInfo
-				{
-					UserId = player.UserId,
-					Index = (int)player.Index,
-					SteamId = player?.SteamID.ToString(),
-					Name = player?.PlayerName,
-					IpAddress = player?.IpAddress?.Split(":")[0]
-				};
+                PlayerInfo playerInfo = new PlayerInfo(
+					(int)player.Slot,
+					player.Slot,
+					player.UserId,
+					player?.SteamID.ToString(),
+					player?.PlayerName,
+					player?.IpAddress?.Split(":")[0]);
 
 				if (Config.Additional.SkinEnabled)
-					_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+				{
+					Task.Run(() => weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+				}
 				if (Config.Additional.KnifeEnabled)
-					_ = weaponSync.GetKnifeFromDatabase(playerInfo);
+				{
+					Task.Run(() => weaponSync.GetKnifeFromDatabase(playerInfo));
+				}
 				if (Config.Additional.GloveEnabled)
-					_ = weaponSync.GetGloveFromDatabase(playerInfo);
+				{
+					Task.Run(() => weaponSync.GetGloveFromDatabase(playerInfo));
+				}
 			}
 		}
 
@@ -207,10 +217,16 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		RegisterListeners();
 		RegisterCommands();
 	}
-
-	public void OnConfigParsed(WeaponPaintsConfig config)
+    public static void PlayerGiveNamedItem(CCSPlayerController player, string item)
     {
-		if (!config.GlobalShare)
+        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)
 		{
@@ -231,7 +247,6 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		_database = new(builder.ConnectionString);
 
 		_ = Utility.CheckDatabaseTables();
-		}
 
 		Config = config;
 		_config = config;
@@ -246,41 +261,4 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	{
 		base.Unload(hotReload);
 	}
-
-	private void GlobalShareConnect()
-	{
-		if (!Config.GlobalShare) return;
-
-		var values = new Dictionary<string, string>
-			{
-			   { "server_address", $"{ConVar.Find("ip")!.StringValue}:{ConVar.Find("hostport")!.GetPrimitiveValue<int>().ToString()}" },
-			   { "server_hostname", ConVar.Find("hostname")!.StringValue }
-			};
-
-		using (var httpClient = new HttpClient())
-		{
-			httpClient.BaseAddress = GlobalShareApi;
-			var formContent = new FormUrlEncodedContent(values);
-
-			Task<HttpResponseMessage> responseTask = httpClient.PostAsync("", formContent);
-			responseTask.Wait();
-			HttpResponseMessage response = responseTask.Result;
-
-			if (response.IsSuccessStatusCode)
-			{
-				Task<string> responseBodyTask = response.Content.ReadAsStringAsync();
-				responseBodyTask.Wait();
-				string responseBody = responseBodyTask.Result;
-				GlobalShareServerId = int.Parse(responseBody);
-			}
-			else
-			{
-				Logger.LogError("Unable to retrieve serverid from GlobalShare!");
-				throw new Exception("[WeaponPaints] Unable to retrieve serverid from GlobalShare!");
-			}
-		}
-
-		Logger.LogInformation("GlobalShare ONLINE!");
-		Console.WriteLine("[WeaponPaints] GlobalShare ONLINE");
-	}
 }

WeaponPaints.csproj

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

WeaponSynchronization.cs

@@ -1,5 +1,4 @@
 using Dapper;
-using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
 
 namespace WeaponPaints
@@ -8,68 +7,25 @@ namespace WeaponPaints
 	{
 		private readonly WeaponPaintsConfig _config;
 		private readonly Database _database;
-		private readonly Uri _globalShareApi;
-		private readonly int _globalShareServerId;
 
-		internal WeaponSynchronization(Database database, WeaponPaintsConfig config, Uri globalShareApi, int globalShareServerId)
+		internal WeaponSynchronization(Database database, WeaponPaintsConfig config)
 		{
 			_database = database;
 			_config = config;
-			_globalShareApi = globalShareApi;
-			_globalShareServerId = globalShareServerId;
 		}
 
 		internal async Task GetKnifeFromDatabase(PlayerInfo player)
 		{
 			if (!_config.Additional.KnifeEnabled) return;
-			if (player.SteamId == null || player.Index == 0) return;
 			try
 			{
-				if (_config.GlobalShare)
-				{
-					var values = new Dictionary<string, string>
-				{
-				   { "server_id", _globalShareServerId.ToString() },
-				   { "steamid", player.SteamId },
-				   { "knife", "1" }
-				};
-
-					UriBuilder builder = new UriBuilder(_globalShareApi);
-					builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
-
-					using (var httpClient = new HttpClient())
-					{
-						httpClient.BaseAddress = _globalShareApi;
-						var formContent = new FormUrlEncodedContent(values);
-						HttpResponseMessage response = await httpClient.GetAsync(builder.Uri);
-
-						if (response.IsSuccessStatusCode)
-						{
-							string result = await response.Content.ReadAsStringAsync();
-							if (!string.IsNullOrEmpty(result))
-							{
-								WeaponPaints.g_playersKnife[player.Index] = result;
-							}
-							else
-							{
-								return;
-							}
-						}
-						else
-						{
-							return;
-						}
-					}
-					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 });
 
 				if (!string.IsNullOrEmpty(playerKnife))
 				{
-					WeaponPaints.g_playersKnife[player.Index] = playerKnife;
+					WeaponPaints.g_playersKnife[player.Slot] = playerKnife;
 				}
 			}
 			catch (Exception e)
@@ -82,116 +38,75 @@ namespace WeaponPaints
 		internal async Task GetGloveFromDatabase(PlayerInfo player)
 		{
 			if (!_config.Additional.GloveEnabled) return;
+
 			try
 			{
+				// Ensure proper disposal of resources using "using" statement
 				await using var connection = await _database.GetConnectionAsync();
-				string query = "SELECT `weapon_defindex`, `paint` FROM `wp_player_gloves` WHERE `steamid` = @steamid";
-				var gloveData = await connection.QueryFirstOrDefaultAsync<(ushort Definition, int Paint)>(query, new { steamid = player.SteamId });
 
-				if (gloveData != default)
+				// 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)
 				{
-					WeaponPaints.g_playersGlove[(uint)player.Index] = gloveData;
+					// Update g_playersGlove dictionary with glove data
+					WeaponPaints.g_playersGlove[player.Slot] = gloveData.Value;
 				}
 			}
 			catch (Exception e)
 			{
-				Utility.Log(e.Message);
-				return;
+				// Log any exceptions occurred during database operation
+				Utility.Log("An error occurred while fetching glove data: " + e.Message);
 			}
 		}
 
 		internal async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
 		{
-			if (!_config.Additional.SkinEnabled) return;
+			if (!_config.Additional.SkinEnabled || player == null || player.SteamId == null) return;
 
-			if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out _))
-			{
-				WeaponPaints.gPlayerWeaponsInfo[player.Index] = new ConcurrentDictionary<int, WeaponInfo>();
-			}
 			try
 			{
-				if (_config.GlobalShare)
-				{
-					var values = new Dictionary<string, string>
-				{
-				   { "server_id", _globalShareServerId.ToString() },
-				   { "steamid", player.SteamId },
-				   { "skins", "1" }
-				};
-					UriBuilder builder = new UriBuilder(_globalShareApi);
-					builder.Query = string.Join("&", values.Select(p => $"{Uri.EscapeDataString(p.Key)}={Uri.EscapeDataString(p.Value)}"));
-
-					using (var httpClient = new HttpClient())
-					{
-						httpClient.BaseAddress = _globalShareApi;
-						var formContent = new FormUrlEncodedContent(values);
-						HttpResponseMessage response = await httpClient.GetAsync(builder.Uri);
-
-						if (response.IsSuccessStatusCode)
-						{
-							string responseBody = await response.Content.ReadAsStringAsync();
-							JArray jsonArray = JArray.Parse(responseBody);
-							if (jsonArray != null && jsonArray.Count > 0)
-							{
-								foreach (var weapon in jsonArray)
-								{
-									int? weaponDefIndex = weapon["weapon_defindex"]?.Value<int>();
-									int? weaponPaintId = weapon["weapon_paint_id"]?.Value<int>();
-									float? weaponWear = weapon["weapon_wear"]?.Value<float>();
-									int? weaponSeed = weapon["weapon_seed"]?.Value<int>();
-
-									if (weaponDefIndex != null && weaponPaintId != null && weaponWear != null && weaponSeed != null)
-									{
-										WeaponInfo weaponInfo = new WeaponInfo
-										{
-											Paint = weaponPaintId.Value,
-											Seed = weaponSeed.Value,
-											Wear = weaponWear.Value
-										};
-										WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex.Value] = weaponInfo;
-									}
-								}
-							}
-							return;
-						}
-						else
-						{
-							return;
-						}
-					}
-				}
-
 				await using var connection = await _database.GetConnectionAsync();
-				string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
+                string query = "SELECT `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed` FROM `wp_player_skins` WHERE `steamid` = @steamid";
+
                 var playerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
 
+				if (playerSkins == null) return;
+
+				var weaponInfos = new ConcurrentDictionary<int, WeaponInfo>();
+
 				foreach (var row in playerSkins)
 				{
-					int? weaponDefIndex = row.weapon_defindex;
-					int? weaponPaintId = row.weapon_paint_id;
-					float? weaponWear = row.weapon_wear;
-					int? weaponSeed = row.weapon_seed;
+					int weaponDefIndex = row?.weapon_defindex ?? 0;
+					int weaponPaintId = row?.weapon_paint_id ?? 0;
+					float weaponWear = row?.weapon_wear ?? 0f;
+					int weaponSeed = row?.weapon_seed ?? 0;
 
 					WeaponInfo weaponInfo = new WeaponInfo
 					{
-						Paint = weaponPaintId.HasValue ? weaponPaintId.Value : 0,
-						Seed = weaponSeed.HasValue ? weaponSeed.Value : 0,
-						Wear = weaponWear.HasValue ? weaponWear.Value : 0f
+						Paint = weaponPaintId,
+						Seed = weaponSeed,
+						Wear = weaponWear
 					};
 
-					WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex.GetValueOrDefault()] = weaponInfo;
+					weaponInfos[weaponDefIndex] = weaponInfo;
 				}
+
+				WeaponPaints.gPlayerWeaponsInfo[player.Slot] = weaponInfos;
 			}
 			catch (Exception e)
 			{
-				Utility.Log(e.Message);
-				return;
+				Utility.Log($"Database error occurred: {e.Message}");
 			}
 		}
 
 		internal async Task SyncKnifeToDatabase(PlayerInfo player, string knife)
 		{
-			if (!_config.Additional.KnifeEnabled) return;
+			if (!_config.Additional.KnifeEnabled || player == null || string.IsNullOrEmpty(player.SteamId) || string.IsNullOrEmpty(knife)) return;
 
 			try
 			{
@@ -201,36 +116,37 @@ namespace WeaponPaints
 			}
 			catch (Exception e)
 			{
-				Utility.Log(e.Message);
+				Utility.Log($"Error syncing knife to database: {e.Message}");
 			}
 		}
 
-		internal async Task SyncGloveToDatabase(PlayerInfo player, ushort defindex, int paint)
+
+		internal async Task SyncGloveToDatabase(PlayerInfo player, int defindex)
 		{
-			if (!_config.Additional.GloveEnabled) return;
+			if (!_config.Additional.GloveEnabled || player == null || string.IsNullOrEmpty(player.SteamId)) return;
 
 			try
 			{
 				await using var connection = await _database.GetConnectionAsync();
-				string query = "INSERT INTO `wp_player_gloves` (`steamid`, `weapon_defindex`, `paint`) VALUES(@steamid, @weapon_defindex, @paint) ON DUPLICATE KEY UPDATE `weapon_defindex` = @weapon_defindex, `paint` = @paint";
-				await connection.ExecuteAsync(query, new { steamid = player.SteamId, weapon_defindex = defindex, paint });
+				string query = "INSERT INTO `wp_player_gloves` (`steamid`, `weapon_defindex`) VALUES(@steamid, @weapon_defindex) ON DUPLICATE KEY UPDATE `weapon_defindex` = @weapon_defindex";
+				await connection.ExecuteAsync(query, new { steamid = player.SteamId, weapon_defindex = defindex });
 			}
 			catch (Exception e)
 			{
-				Utility.Log(e.Message);
+				Utility.Log($"Error syncing glove to database: {e.Message}");
 			}
 		}
 
 		internal async Task SyncWeaponPaintsToDatabase(PlayerInfo player)
 		{
-			if (player == null || player.Index <= 0 || player.SteamId == null) return;
-
-			await using var connection = await _database.GetConnectionAsync();
-
-			if (!WeaponPaints.gPlayerWeaponsInfo.ContainsKey(player.Index))
+			if (player == null || string.IsNullOrEmpty(player.SteamId) || !WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Slot, out var weaponsInfo))
 				return;
 
-			foreach (var weaponInfoPair in WeaponPaints.gPlayerWeaponsInfo[player.Index])
+			try
+			{
+				await using var connection = await _database.GetConnectionAsync();
+
+                foreach (var weaponInfoPair in weaponsInfo)
                 {
                     int weaponDefIndex = weaponInfoPair.Key;
                     WeaponInfo weaponInfo = weaponInfoPair.Value;
@@ -239,15 +155,26 @@ namespace WeaponPaints
                     float wear = weaponInfo.Wear;
                     int seed = weaponInfo.Seed;
 
-				string updateSql = "INSERT INTO `wp_player_skins` (`steamid`, `weapon_defindex`, " +
-								   "`weapon_paint_id`, `weapon_wear`, `weapon_seed`) " +
+                    string query = "INSERT INTO `wp_player_skins` (`steamid`, `weapon_defindex`, `weapon_paint_id`, `weapon_wear`, `weapon_seed`) " +
                                    "VALUES (@steamid, @weaponDefIndex, @paintId, @wear, @seed) " +
-								   "ON DUPLICATE KEY UPDATE `weapon_paint_id` = @paintId, " +
-								   "`weapon_wear` = @wear, `weapon_seed` = @seed";
+                                   "ON DUPLICATE KEY UPDATE `weapon_paint_id` = @paintId, `weapon_wear` = @wear, `weapon_seed` = @seed";
 
-				var updateParams = new { steamid = player.SteamId, weaponDefIndex, paintId, wear, seed };
-				await connection.ExecuteAsync(updateSql, updateParams);
+                    var parameters = new DynamicParameters();
+                    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}");
 			}
 		}
+
 	}
 }

gamedata/gloves.json

@@ -0,0 +1,16 @@
+{
+	"CAttributeList_SetOrAddAttributeValueByName": {
+		"signatures": {
+			"library": "server",
+			"windows": "\\x40\\x53\\x41\\x56\\x41\\x57\\x48\\x81\\xEC\\x90\\x00\\x00\\x00\\x0F\\x29\\x74\\x24\\x70",
+			"linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x41\\x56\\x49\\x89\\xFE\\x41\\x55\\x41\\x54\\x49\\x89\\xF4\\x53\\x48\\x83\\xEC\\x78"
+		}
+	},
+	"CBaseModelEntity_SetBodygroup": {
+		"signatures": {
+			"library": "server",
+			"windows": "\\x48\\x89\\x5C\\x24\\x08\\x48\\x89\\x74\\x24\\x10\\x57\\x48\\x83\\xEC\\x20\\x41\\x8B\\xF8\\x48\\x8B\\xF2\\x48\\x8B\\xD9\\xE8\\x2A\\x2A\\x2A\\x2A",
+			"linux": "\\x55\\x48\\x89\\xE5\\x41\\x56\\x49\\x89\\xF6\\x41\\x55\\x41\\x89\\xD5\\x41\\x54\\x49\\x89\\xFC\\x48\\x83\\xEC\\x08"
+		}
+	}
+}

lang/pl.json

@@ -7,7 +7,7 @@
 	"wp_command_cooldown": "{lightred}Nie możesz teraz odświeżyć skórek broni",
 	"wp_command_refresh_done": "{lime}Odświeżanie skórek broni",
 	"wp_knife_menu_select": "Wybrałeś {lime}{0}{default} jako swój nóż",
-	"wp_knife_menu_kill": "",
+	"wp_knife_menu_kill": "{lime}Wybrane skiny będą ustawione dopiero po ponownym wejściu na serwer lub wpisaniu komendy {orange}!kill",
 	"wp_knife_menu_title": "Menu Noży",
 	"wp_glove_menu_select": "Wybrałeś {lime}{0}{default} jako swoje rękawiczki",
 	"wp_glove_menu_title": "Menu Rękawiczek",