Some fixes

Commands.cs

@@ -32,13 +32,30 @@ namespace WeaponPaints
 
 					if (weaponSync != null)
 					{
-						Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+						var weaponTasks = new List<Task>();
+
+						weaponTasks.Add(Task.Run(async () =>
+						{
+							await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+						}));
 
 						if (Config.Additional.GloveEnabled)
-							Task.Run(async () => await weaponSync.GetGloveFromDatabase(playerInfo));
+						{
+							weaponTasks.Add(Task.Run(async () =>
+							{
+								await weaponSync.GetGloveFromDatabase(playerInfo);
+							}));
+						}
 
 						if (Config.Additional.KnifeEnabled)
-							Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
+						{
+							weaponTasks.Add(Task.Run(async () =>
+							{
+								await weaponSync.GetKnifeFromDatabase(playerInfo);
+							}));
+						}
+
+						Task.WaitAll(weaponTasks.ToArray());
 
 						RefreshGloves(player);
 						RefreshWeapons(player);

Events.cs

@@ -71,6 +71,7 @@ namespace WeaponPaints
 				Task.Run(async () =>
 				{
 					await weaponSync.SyncWeaponPaintsToDatabase(playerInfo);
+				});
 
 				// Remove player data
 				if (Config.Additional.SkinEnabled)
@@ -85,7 +86,6 @@ namespace WeaponPaints
 				{
 					g_playersGlove.TryRemove(player.Slot, out _);
 				}
-				});
 			}
 
 			// Remove player's command cooldown
@@ -187,12 +187,11 @@ namespace WeaponPaints
 		{
 			CCSPlayerController? player = @event.Userid;
 
-			if (player is null || !player.IsValid || player.PlayerPawn == null ||
+			if (player is null || !player.IsValid || !Config.Additional.KnifeEnabled && !Config.Additional.GloveEnabled)
-			!player.PlayerPawn.IsValid || player.IsHLTV
-			|| !Config.Additional.KnifeEnabled && !Config.Additional.GloveEnabled)
 				return HookResult.Continue;
 
 			g_knifePickupCount[player.Slot] = 0;
+
 			if (!PlayerHasKnife(player))
 				GiveKnifeToPlayer(player);
 

WeaponAction.cs

@@ -142,6 +142,8 @@ namespace WeaponPaints
 		{
 			if (!_config.Additional.KnifeEnabled || player == null || !player.IsValid) return;
 
+			WeaponPaints.Instance.AddTimer(1.0f, () =>
+			{
 				string knifeToGive;
 				if (g_playersKnife.TryGetValue(player.Slot, out var knife))
 				{
@@ -167,13 +169,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;
 			}
@@ -273,6 +276,8 @@ namespace WeaponPaints
 					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();
@@ -318,10 +323,10 @@ namespace WeaponPaints
 
 		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;
@@ -337,8 +342,10 @@ namespace WeaponPaints
 
 							if (weapon.Value.DesignerName.Contains("knife") || weaponData?.GearSlot == gear_slot_t.GEAR_SLOT_KNIFE)
 							{
-								RefreshWeapons(player);
+								player.ExecuteClientCommand("slot 3");
-								break;
+
+								weapon.Value.Remove();
+								GiveKnifeToPlayer(player);
 							}
 						}
 						catch (Exception ex)