Merge pull request #79 from daffyyyy/some-changes

Workaround for long player authorization

Commands.cs

@@ -16,14 +16,14 @@ namespace WeaponPaints
 			});
 			AddCommand($"css_{Config.Additional.CommandRefresh}", "Skins refresh", (player, info) =>
 			{
-				if (!Utility.IsPlayerValid(player)) return;
+				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
 				OnCommandRefresh(player, info);
 			});
 			if (Config.Additional.CommandKillEnabled)
 			{
 				AddCommand($"css_{Config.Additional.CommandKill}", "kill yourself", (player, info) =>
 				{
-					if (!Utility.IsPlayerValid(player) || !player!.PlayerPawn.IsValid) return;
+					if (player == null || !Utility.IsPlayerValid(player) || player.PlayerPawn.Value == null || !player!.PlayerPawn.IsValid) return;
 
 					player.PlayerPawn.Value.CommitSuicide(true, false);
 				});
@@ -31,7 +31,7 @@ namespace WeaponPaints
 		}
 		private void SetupKnifeMenu()
 		{
-			if (!Config.Additional.KnifeEnabled) return;
+			if (!Config.Additional.KnifeEnabled || !g_bCommandsAllowed) return;
 
 			var knivesOnly = weaponList
 				.Where(pair => pair.Key.StartsWith("weapon_knife") || pair.Key.StartsWith("weapon_bayonet"))
@@ -60,22 +60,20 @@ namespace WeaponPaints
 							player!.PrintToChat(Utility.ReplaceTags(temp));
 						}
 
-						g_playersKnife[(int)player!.EntityIndex!.Value.Value] = knifeKey;
+						g_playersKnife[(int)player!.Index] = knifeKey;
 
-						if (player!.PawnIsAlive)
+						if (player!.PawnIsAlive && g_bCommandsAllowed)
 						{
-							g_changedKnife.Add((int)player.EntityIndex!.Value.Value);
-							if (PlayerHasKnife(player))
-							{
-								RefreshPlayerKnife(player);
-							}
+							//g_changedKnife.Add((int)player.Index);
+							RefreshWeapons(player);
+							//RefreshPlayerKnife(player);
 
 							/*
 							AddTimer(1.0f, () => GiveKnifeToPlayer(player));
 							*/
 						}
 						if (weaponSync != null)
-							Task.Run(() => weaponSync.SyncKnifeToDatabase((int)player.EntityIndex!.Value.Value, knifeKey));
+							Task.Run(() => weaponSync.SyncKnifeToDatabase((int)player.Index, knifeKey));
 					}
 				}
 			};
@@ -85,8 +83,8 @@ namespace WeaponPaints
 			}
 			AddCommand($"css_{Config.Additional.CommandKnife}", "Knife Menu", (player, info) =>
 			{
-				if (!Utility.IsPlayerValid(player)) return;
-				int playerIndex = (int)player!.EntityIndex!.Value.Value;
+				if (!Utility.IsPlayerValid(player) || !g_bCommandsAllowed) return;
+				int playerIndex = (int)player!.Index;
 
 				if (commandCooldown != null && DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds) && playerIndex > 0 && playerIndex < commandCooldown.Length)
 				{
@@ -112,7 +110,7 @@ namespace WeaponPaints
 			{
 				if (!Utility.IsPlayerValid(player)) return;
 
-				int playerIndex = (int)player!.EntityIndex!.Value.Value;
+				int playerIndex = (int)player!.Index;
 				string selectedWeapon = option.Text;
 				if (classNamesByWeapon.TryGetValue(selectedWeapon, out string? selectedWeaponClassname))
 				{
@@ -128,9 +126,11 @@ namespace WeaponPaints
 					// Function to handle skin selection for the chosen weapon
 					var handleSkinSelection = (CCSPlayerController? p, ChatMenuOption opt) =>
 					{
-						if (p == null || !p.IsValid) return;
+						if (p == null || !p.IsValid || p.Index <= 0) return;
 
-						var steamId = new SteamID(player.SteamID);
+						playerIndex = (int)p.Index;
+
+						var steamId = new SteamID(p.SteamID);
 						var firstSkin = skinsList?.FirstOrDefault(skin =>
 						{
 							if (skin != null && skin.TryGetValue("weapon_name", out var weaponName))
@@ -151,22 +151,23 @@ namespace WeaponPaints
 							string temp = $" {Config.Prefix} {Config.Messages.ChosenSkinMenu}".Replace("{SKIN}", selectedSkin);
 							p.PrintToChat(Utility.ReplaceTags(temp));
 
-							/*
-							 if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
+							if (!gPlayerWeaponsInfo[playerIndex].ContainsKey(weaponDefIndex))
 							{
 								gPlayerWeaponsInfo[playerIndex][weaponDefIndex] = new WeaponInfo();
 							}
-							*/
 
 							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Paint = paintID;
 							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Wear = 0.0f;
 							gPlayerWeaponsInfo[playerIndex][weaponDefIndex].Seed = 0;
 
-							if (weaponSync == null) return;
-							Task.Run(async () =>
+							if (!Config.GlobalShare)
 							{
-								await weaponSync.SyncWeaponPaintsToDatabase(player);
-							});
+								if (weaponSync == null) return;
+								Task.Run(async () =>
+								{
+									await weaponSync.SyncWeaponPaintsToDatabase(p);
+								});
+							}
 						}
 					};
 
@@ -203,7 +204,7 @@ namespace WeaponPaints
 			AddCommand($"css_{Config.Additional.CommandSkinSelection}", "Skins selection menu", (player, info) =>
 			{
 				if (!Utility.IsPlayerValid(player)) return;
-				int playerIndex = (int)player!.EntityIndex!.Value.Value;
+				int playerIndex = (int)player!.Index;
 
 				if (commandCooldown != null && DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds) && playerIndex > 0 && playerIndex < commandCooldown.Length)
 				{
@@ -222,11 +223,11 @@ namespace WeaponPaints
 
 		private void OnCommandRefresh(CCSPlayerController? player, CommandInfo command)
 		{
-			if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled) return;
+			if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled || !g_bCommandsAllowed) return;
 			if (!Utility.IsPlayerValid(player)) return;
 			string temp = "";
-			if (!player!.EntityIndex.HasValue) return;
-			int playerIndex = (int)player!.EntityIndex!.Value.Value;
+			if (player == null || player.Index <= 0) return;
+			int playerIndex = (int)player!.Index;
 			if (playerIndex != 0 && DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds))
 			{
 				commandCooldown[playerIndex] = DateTime.UtcNow;

Events.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Entities;
 
 namespace WeaponPaints
 {
@@ -8,17 +9,18 @@ namespace WeaponPaints
 		private void RegisterEvents()
 		{
 			RegisterListener<Listeners.OnEntitySpawned>(OnEntitySpawned);
-			/*RegisterListener<Listeners.OnClientAuthorized>(OnClientAuthorized);*/
+			RegisterListener<Listeners.OnClientAuthorized>(OnClientAuthorized);
 			RegisterListener<Listeners.OnClientDisconnect>(OnClientDisconnect);
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
 			RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
+			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
 			RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
 			RegisterEventHandler<EventItemPickup>(OnItemPickup);
 		}
 
-		private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
+		/*private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
 		{
 			CCSPlayerController? player = @event.Userid;
 
@@ -29,17 +31,16 @@ namespace WeaponPaints
 				_ = weaponSync.GetWeaponPaintsFromDatabase(playerIndex);
 			if (Config.Additional.KnifeEnabled && weaponSync != null)
 				_ = weaponSync.GetKnifeFromDatabase(playerIndex);
-			/*
+
 			Task.Run(async () =>
 			{
 				if (Config.Additional.SkinEnabled && weaponSync != null)
 				if (Config.Additional.KnifeEnabled && weaponSync != null)
 			});
-			*/
 
 			return HookResult.Continue;
 		}
-
+	*/
 		private void OnMapStart(string mapName)
 		{
 			if (!Config.Additional.KnifeEnabled) return;
@@ -50,31 +51,84 @@ 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();
 			});
+
+			g_hTimerCheckSkinsData = AddTimer(10.0f, () =>
+			{
+				List<CCSPlayerController> players = Utilities.GetPlayers();
+
+				foreach (CCSPlayerController player in players)
+				{
+					if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.SteamID == 0) continue;
+					if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
+
+					if (Config.Additional.SkinEnabled && weaponSync != null)
+						_ = weaponSync.GetWeaponPaintsFromDatabase((int)player.Index);
+					if (Config.Additional.KnifeEnabled && weaponSync != null)
+						_ = weaponSync.GetKnifeFromDatabase((int)player.Index);
+
+				}
+			}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE | CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
 		}
-		/*
+
 		private void OnClientAuthorized(int playerSlot, SteamID steamID)
 		{
 			int playerIndex = playerSlot + 1;
-			Task.Run(async () =>
-			{
-				if (Config.Additional.SkinEnabled && weaponSync != null)
-					await weaponSync.GetWeaponPaintsFromDatabase(playerIndex);
-				if (Config.Additional.KnifeEnabled && weaponSync != null)
-					await weaponSync.GetKnifeFromDatabase(playerIndex);
-			});
+
+			CCSPlayerController? player = Utilities.GetPlayerFromIndex(playerIndex);
+
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) return;
+
+			if (Config.Additional.SkinEnabled && weaponSync != null)
+				_ = weaponSync.GetWeaponPaintsFromDatabase(playerIndex);
+			if (Config.Additional.KnifeEnabled && weaponSync != null)
+				_ = weaponSync.GetKnifeFromDatabase(playerIndex);
+		}
+
+		/* WORKAROUND FOR CLIENTS WITHOUT STEAMID ON AUTHORIZATION */
+		private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
+		{
+			CCSPlayerController? player = @event.Userid;
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) return HookResult.Continue;
+
+			if (!gPlayerWeaponsInfo.ContainsKey((int)player.Index))
+			{
+				Console.WriteLine($"[WeaponPaints] Retrying to retrieve player {player.PlayerName} skins");
+				if (Config.Additional.SkinEnabled && weaponSync != null)
+					_ = weaponSync.GetWeaponPaintsFromDatabase((int)player.Index);
+				if (Config.Additional.KnifeEnabled && weaponSync != null)
+					_ = weaponSync.GetKnifeFromDatabase((int)player.Index);
+
+				/*
+				AddTimer(2.0f, () =>
+				{
+					if (!gPlayerWeaponsInfo.ContainsKey((int)player.Index))
+					{
+						Console.WriteLine($"[WeaponPaints] Last try to retrieve player {player.PlayerName} skins");
+						if (Config.Additional.SkinEnabled && weaponSync != null)
+							_ = weaponSync.GetWeaponPaintsFromDatabase((int)player.Index);
+						if (Config.Additional.KnifeEnabled && weaponSync != null)
+							_ = weaponSync.GetKnifeFromDatabase((int)player.Index);
+					}
+				});
+				*/
+			}
+
+			return HookResult.Continue;
 		}
-		*/
 		private void OnClientDisconnect(int playerSlot)
 		{
 			CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
 
-			if (player == null || !player.IsValid || player.IsHLTV) return;
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) return;
 
 			if (Config.Additional.KnifeEnabled)
-				g_playersKnife.Remove((int)player.EntityIndex!.Value.Value);
+				g_playersKnife.Remove((int)player.Index);
 			if (Config.Additional.SkinEnabled)
-				gPlayerWeaponsInfo.Remove((int)player.EntityIndex!.Value.Value);
+				gPlayerWeaponsInfo.Remove((int)player.Index);
 		}
 
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
@@ -87,7 +141,7 @@ namespace WeaponPaints
 
 			if (Config.Additional.KnifeEnabled)
 			{
-				g_knifePickupCount[(int)player.EntityIndex!.Value.Value] = 0;
+				g_knifePickupCount[(int)player.Index] = 0;
 				if (!PlayerHasKnife(player))
 					GiveKnifeToPlayer(player);
 			}
@@ -105,23 +159,32 @@ namespace WeaponPaints
 			NativeAPI.IssueServerCommand("mp_ct_default_melee \"\"");
 			NativeAPI.IssueServerCommand("mp_equipment_reset_rounds 0");
 
+			g_bCommandsAllowed = true;
+
 			return HookResult.Continue;
 		}
+
+		private HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
+		{
+			g_bCommandsAllowed = false;
+			return HookResult.Continue;
+		}
+
 		private HookResult OnItemPickup(EventItemPickup @event, GameEventInfo info)
 		{
 			if (@event.Defindex == 42 || @event.Defindex == 59)
 			{
 				CCSPlayerController? player = @event.Userid;
-				if (!Utility.IsPlayerValid(player) || !player.PawnIsAlive || g_knifePickupCount[(int)player.EntityIndex!.Value.Value] >= 2) return HookResult.Continue;
+				if (!Utility.IsPlayerValid(player) || !player.PawnIsAlive || g_knifePickupCount[(int)player.Index] >= 2) return HookResult.Continue;
 
-				if (g_playersKnife.ContainsKey((int)player.EntityIndex!.Value.Value)
+				if (g_playersKnife.ContainsKey((int)player.Index)
 					&&
-				   g_playersKnife[(int)player.EntityIndex!.Value.Value] != "weapon_knife")
+				   g_playersKnife[(int)player.Index] != "weapon_knife")
 				{
-					g_knifePickupCount[(int)player.EntityIndex!.Value.Value]++;
+					g_knifePickupCount[(int)player.Index]++;
 
 					RemovePlayerKnife(player, true);
-					AddTimer(0.3f, ()=> GiveKnifeToPlayer(player));
+					AddTimer(0.3f, () => GiveKnifeToPlayer(player));
 
 					//RefreshPlayerKnife(player);
 					/*
@@ -154,29 +217,32 @@ namespace WeaponPaints
 			{
 				try
 				{
+
 					if (!weapon.IsValid) return;
 					if (weapon.OwnerEntity.Value == null) return;
-					if (!weapon.OwnerEntity.Value.EntityIndex.HasValue)
+					/*
+					if (weapon.OwnerEntity.Index > 0)
 					{
 						for (int i = 1; i <= Server.MaxPlayers; i++)
 						{
 							CCSPlayerController? ghostPlayer = Utilities.GetPlayerFromIndex(i);
 							if (!Utility.IsPlayerValid(ghostPlayer)) continue;
-							if (g_changedKnife.Contains((int)ghostPlayer.EntityIndex!.Value.Value))
+							if (g_changedKnife.Contains((int)ghostPlayer.Index))
 							{
 								ChangeWeaponAttributes(weapon, ghostPlayer, isKnife);
-								g_changedKnife.Remove((int)ghostPlayer.EntityIndex!.Value.Value);
+								g_changedKnife.Remove((int)ghostPlayer.Index);
 								break;
 							}
 						}
-						return;
+						
 					}
-
-					if (!weapon.OwnerEntity.Value.EntityIndex.HasValue) return;
-					int weaponOwner = (int)weapon.OwnerEntity.Value.EntityIndex.Value.Value;
+					*/
+					if (weapon.OwnerEntity.Index <= 0) return;
+					int weaponOwner = (int)weapon.OwnerEntity.Index;
 					var pawn = new CBasePlayerPawn(NativeAPI.GetEntityFromIndex(weaponOwner));
 					if (!pawn.IsValid) return;
-					var playerIndex = (int)pawn.Controller.Value.EntityIndex!.Value.Value;
+
+					var playerIndex = (int)pawn.Controller.Index;
 					var player = Utilities.GetPlayerFromIndex(playerIndex);
 					if (!Utility.IsPlayerValid(player)) return;
 

Utility.cs

@@ -19,7 +19,7 @@ namespace WeaponPaints
 
 		internal static string BuildDatabaseConnectionString()
 		{
-			if (Config == null) return String.Empty;
+			if (Config == null) return string.Empty;
 			var builder = new MySqlConnectionStringBuilder
 			{
 				Server = Config.DatabaseHost,

WeaponAction.cs

@@ -9,9 +9,9 @@ namespace WeaponPaints
 	{
 		internal static void ChangeWeaponAttributes(CBasePlayerWeapon? weapon, CCSPlayerController? player, bool isKnife = false)
 		{
-			if (weapon == null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
+			if (player == null || weapon == null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
 
-			int playerIndex = (int)player!.EntityIndex!.Value.Value;
+			int playerIndex = (int)player.Index;
 
 			if (!gPlayerWeaponsInfo.ContainsKey(playerIndex)) return;
 
@@ -55,7 +55,7 @@ namespace WeaponPaints
 		internal static void GiveKnifeToPlayer(CCSPlayerController? player)
 		{
 			if (!_config.Additional.KnifeEnabled || player == null || !player.IsValid) return;
-			if (g_playersKnife.TryGetValue((int)player.EntityIndex!.Value.Value, out var knife))
+			if (g_playersKnife.TryGetValue((int)player.Index, out var knife))
 			{
 				player.GiveNamedItem(knife);
 			}
@@ -77,7 +77,7 @@ namespace WeaponPaints
 		}
 		internal void RemovePlayerKnife(CCSPlayerController? player, bool force = false)
 		{
-			if (player == null || !player.IsValid || !player.PawnIsAlive) return;
+			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) return;
 			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null) return;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
@@ -88,16 +88,16 @@ namespace WeaponPaints
 
 				foreach (var weapon in weapons)
 				{
-					if (weapon != null && weapon.IsValid && weapon.Value.IsValid)
+					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
 					{
 						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
 						if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
 						{
 							if (!force)
 							{
-								if (!weapon.Value.EntityIndex.HasValue) return;
-								int weaponEntityIndex = (int)weapon.Value.EntityIndex!.Value.Value;
-								NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3");
+								if ((int)weapon.Index <= 0) return;
+								int weaponEntityIndex = (int)weapon.Index;
+								NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
 								AddTimer(0.35f, () => service.DropActivePlayerWeapon(weapon.Value));
 
 								AddTimer(1.0f, () =>
@@ -123,35 +123,35 @@ namespace WeaponPaints
 
 		internal void RefreshPlayerKnife(CCSPlayerController? player)
 		{
-			if (player == null || !player.IsValid || !player.PawnIsAlive) return;
+			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) 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)
 			{
-				CCSPlayer_ItemServices service = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
+				CCSPlayer_ItemServices service = new(player.PlayerPawn.Value.ItemServices.Handle);
 				//var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
 
 				foreach (var weapon in weapons)
 				{
-					if (weapon != null && weapon.IsValid && weapon.Value.IsValid)
+					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
 					{
 						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
 						if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
 						{
-							if (!weapon.Value.EntityIndex.HasValue) return;
-							int weaponEntityIndex = (int)weapon.Value.EntityIndex!.Value.Value;
-							NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3");
+							if (weapon.Index <= 0) return;
+							int weaponEntityIndex = (int)weapon.Index;
+							NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
 							AddTimer(0.22f, () =>
 							{
-								if (player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value.DesignerName.Contains("knife")
+								if (player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value!.DesignerName.Contains("knife")
 								||
-								player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value.DesignerName.Contains("bayonet")
+								player.PlayerPawn.Value.WeaponServices.ActiveWeapon.Value!.DesignerName.Contains("bayonet")
 								)
 								{
 									if (player.PawnIsAlive)
 									{
-										NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3");
+										NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3");
 										service.DropActivePlayerWeapon(weapon.Value);
 										GiveKnifeToPlayer(player);
 									}
@@ -164,7 +164,7 @@ namespace WeaponPaints
 								{
 									CEntityInstance? knife = Utilities.GetEntityFromIndex<CEntityInstance>(weaponEntityIndex);
 
-									if (knife != null && knife.IsValid && knife.Handle != -1 && knife.EntityIndex.HasValue)
+									if (knife != null && knife.IsValid && knife.Handle != -1 && knife.Index > 0)
 									{
 										knife.Remove();
 									}
@@ -183,53 +183,67 @@ namespace WeaponPaints
 		{
 			if (!Utility.IsPlayerValid(player) || !player!.PawnIsAlive) return;
 
-			AddTimer(0.18f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3"));
-			AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
-			AddTimer(0.38f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
+			AddTimer(0.18f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot3"));
+			AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot2"));
+			AddTimer(0.38f, () => NativeAPI.IssueClientCommand((int)player.Index - 1, "slot1"));
 		}
 
 		internal void RefreshWeapons(CCSPlayerController? player)
 		{
-			if (player == null || !player.IsValid || !player.PawnIsAlive) return;
+			if (player == null || !player.IsValid || player.PlayerPawn.Value == null || !player.PawnIsAlive) 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)
 			{
-				CCSPlayer_ItemServices service = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
+				CCSPlayer_ItemServices service = new(player.PlayerPawn.Value.ItemServices.Handle);
 				//var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
 
 				foreach (var weapon in weapons)
 				{
-					if (weapon != null && weapon.IsValid && weapon.Value.IsValid)
+					if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
 					{
-						if (!weapon.Value.EntityIndex.HasValue || !weapon.Value.DesignerName.Contains("weapon_")) continue;
+						if (weapon.Index <= 0 || !weapon.Value.DesignerName.Contains("weapon_")) continue;
 						//if (weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.Value.AttributeManager.Item.ItemDefinitionIndex == 59)
-						if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+						try
 						{
-							weapon.Value.Remove();
-							GiveKnifeToPlayer(player);
+							if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
+							{
+								weapon.Value.Remove();
+								GiveKnifeToPlayer(player);
+							}
+							else
+							{
+								int clip1, reservedAmmo;
+
+								clip1 = weapon.Value.Clip1;
+								reservedAmmo = weapon.Value.ReserveAmmo[0];
+
+								weapon.Value.Remove();
+								CBasePlayerWeapon newWeapon = new(player.GiveNamedItem(weapon.Value.DesignerName));
+
+								Server.NextFrame(() =>
+								{
+									if (newWeapon == null) return;
+									try
+									{
+										newWeapon.Clip1 = clip1;
+										newWeapon.ReserveAmmo[0] = reservedAmmo;
+									}
+									catch (Exception)
+									{ }
+								});
+							}
 						}
-						else
+						catch (Exception ex)
 						{
-							int clip1, reservedAmmo;
-
-							clip1 = weapon.Value.Clip1;
-							reservedAmmo = weapon.Value.ReserveAmmo[0];
-
-							weapon.Value.Remove();
-							CBasePlayerWeapon newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(weapon.Value.DesignerName));
-
-							Server.NextFrame(() =>
-							{ 
-								newWeapon.Clip1 = clip1;
-								newWeapon.ReserveAmmo[0] = reservedAmmo;
-							});
-							
+							Console.WriteLine("[WeaponPaints] Refreshing weapons exception");
+							Console.WriteLine(ex.Message);
 						}
 					}
 				}
-				RefreshSkins(player);
+				if (Config.Additional.SkinVisibilityFix)
+					RefreshSkins(player);
 			}
 		}
 
@@ -242,14 +256,14 @@ namespace WeaponPaints
 				return false;
 			}
 
-			if (player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
+			if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.WeaponServices == null || player.PlayerPawn.Value.ItemServices == null)
 				return false;
 
 			var weapons = player.PlayerPawn.Value.WeaponServices.MyWeapons;
 			if (weapons == null || weapons.Count <= 0) return false;
 			foreach (var weapon in weapons)
 			{
-				if (weapon != null && weapon.IsValid && weapon.Value.IsValid)
+				if (weapon != null && weapon.IsValid && weapon.Value != null && weapon.Value.IsValid)
 				{
 					if (weapon.Value.DesignerName.Contains("knife") || weapon.Value.DesignerName.Contains("bayonet"))
 					{
@@ -273,7 +287,7 @@ namespace WeaponPaints
 			if (WeaponPaints.skinsList != null)
 			{
 				// Filter weapons by the provided defindex
-				var filteredWeapons = WeaponPaints.skinsList.FindAll(w => w["weapon_defindex"]?.ToString() == defindex.ToString());
+				var filteredWeapons = skinsList.FindAll(w => w["weapon_defindex"]?.ToString() == defindex.ToString());
 
 				if (filteredWeapons.Count > 0)
 				{

WeaponPaints.cs

@@ -5,18 +5,20 @@ using CounterStrikeSharp.API.Modules.Cvars;
 using Newtonsoft.Json.Linq;
 
 namespace WeaponPaints;
-[MinimumApiVersion(71)]
+[MinimumApiVersion(82)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	public override string ModuleName => "WeaponPaints";
 	public override string ModuleDescription => "Skin and knife selector, standalone and web-based";
 	public override string ModuleAuthor => "Nereziel & daffyy";
-	public override string ModuleVersion => "1.3a";
+	public override string ModuleVersion => "1.3b";
 	public WeaponPaintsConfig Config { get; set; } = new();
 	internal static WeaponPaintsConfig _config = new WeaponPaintsConfig();
 
 	internal static WeaponSynchronization? weaponSync;
 
+	private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
+
 	/*
 	private Dictionary<int, Dictionary<int, int>> gPlayerWeaponPaints = new();
 	private Dictionary<int, Dictionary<int, int>> gPlayerWeaponSeed = new();
@@ -31,7 +33,8 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	internal static Dictionary<int, Dictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new Dictionary<int, Dictionary<int, WeaponInfo>>();
 	internal static Dictionary<int, int> g_knifePickupCount = new Dictionary<int, int>();
 	internal static Dictionary<int, string> g_playersKnife = new();
-	internal static List<int> g_changedKnife = new();
+	//internal static List<int> g_changedKnife = new();
+	internal bool g_bCommandsAllowed = true;
 
 	internal static List<JObject> skinsList = new List<JObject>();
 	internal static readonly Dictionary<string, string> weaponList = new()
@@ -100,10 +103,6 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 			Utility.TestDatabaseConnection();
 		}
 
-		if (Config.GlobalShare)
-			GlobalShareConnect();
-
-
 		weaponSync = new WeaponSynchronization(DatabaseConnectionString, Config, GlobalShareApi, GlobalShareServerId);
 
 		if (hotReload)

WeaponPaints.csproj

@@ -8,16 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="*" />
-    <PackageReference Include="Dapper" Version="2.1.21" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.84" />
+    <PackageReference Include="Dapper" Version="2.1.24" />
     <PackageReference Include="MySqlConnector" Version="2.3.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="CounterStrikeSharp.API">
-      <HintPath>deps\CounterStrikeSharp.API.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>

WeaponSynchronization.cs

@@ -229,9 +229,9 @@ namespace WeaponPaints
 
 		internal async Task SyncWeaponPaintsToDatabase(CCSPlayerController? player)
 		{
-			if (!Utility.IsPlayerValid(player)) return;
+			if (player == null || !Utility.IsPlayerValid(player)) return;
 
-			int playerIndex = (int)player!.EntityIndex!.Value.Value;
+			int playerIndex = (int)player.Index;
 			string steamId = new SteamID(player.SteamID).SteamId64.ToString();
 
 			using var connection = new MySqlConnection(_databaseConnectionString);