Merge pull request #89 from daffyyyy/some-changes

Small fixes cssharp >= 101

Commands.cs

@@ -13,29 +13,39 @@ namespace WeaponPaints
 			string temp = "";
 			if (player == null || player.Index <= 0) return;
 			int playerIndex = (int)player!.Index;
+
+			PlayerInfo playerInfo = new PlayerInfo
+			{
+				UserId = player.UserId,
+				Index = (int)player.Index,
+				SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+				Name = player?.PlayerName,
+				IpAddress = player?.IpAddress?.Split(":")[0]
+			};
+
 			if (playerIndex != 0 && DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds))
 			{
 				commandCooldown[playerIndex] = DateTime.UtcNow;
 				if (weaponSync != null)
-					Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerIndex));
+					Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
 				if (Config.Additional.KnifeEnabled)
 				{
 					if (weaponSync != null)
-						Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerIndex));
+						Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
 
 					RefreshWeapons(player);
 				}
 				if (!string.IsNullOrEmpty(Config.Messages.SuccessRefreshCommand))
 				{
 					temp = $" {Config.Prefix} {Config.Messages.SuccessRefreshCommand}";
-					player.PrintToChat(Utility.ReplaceTags(temp));
+					player!.PrintToChat(Utility.ReplaceTags(temp));
 				}
 				return;
 			}
 			if (!string.IsNullOrEmpty(Config.Messages.CooldownRefreshCommand))
 			{
 				temp = $" {Config.Prefix} {Config.Messages.CooldownRefreshCommand}";
-				player.PrintToChat(Utility.ReplaceTags(temp));
+				player!.PrintToChat(Utility.ReplaceTags(temp));
 			}
 		}
 
@@ -99,6 +109,7 @@ namespace WeaponPaints
 			{
 				if (Utility.IsPlayerValid(player))
 				{
+					if (player == null) return;
 					var knifeName = option.Text;
 					var knifeKey = knivesOnly.FirstOrDefault(x => x.Value == knifeName).Key;
 					if (!string.IsNullOrEmpty(knifeKey))
@@ -117,14 +128,24 @@ namespace WeaponPaints
 							player!.PrintToChat(Utility.ReplaceTags(temp));
 						}
 
+						PlayerInfo playerInfo = new PlayerInfo
+						{
+							UserId = player.UserId,
+							Index = (int)player.Index,
+							SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+							Name = player?.PlayerName,
+							IpAddress = player?.IpAddress?.Split(":")[0]
+						};
+
 						g_playersKnife[(int)player!.Index] = knifeKey;
 
 						if (player!.PawnIsAlive && g_bCommandsAllowed)
 						{
 							RefreshWeapons(player);
 						}
+
 						if (weaponSync != null)
-							Task.Run(() => weaponSync.SyncKnifeToDatabase((int)player.Index, knifeKey));
+							Task.Run(async () => await weaponSync.SyncKnifeToDatabase(playerInfo, knifeKey));
 					}
 				}
 			};

Events.cs

@@ -12,12 +12,25 @@ namespace WeaponPaints
 
 			CCSPlayerController? player = Utilities.GetPlayerFromIndex(playerIndex);
 
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV) return;
+			PlayerInfo playerInfo = new PlayerInfo
+			{
+				UserId = player.UserId,
+				Index = (int)player.Index,
+				SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+				Name = player?.PlayerName,
+				IpAddress = player?.IpAddress?.Split(":")[0]
+			};
 
-			if (Config.Additional.SkinEnabled && weaponSync != null)
-				_ = weaponSync.GetWeaponPaintsFromDatabase(playerIndex);
-			if (Config.Additional.KnifeEnabled && weaponSync != null)
-				_ = weaponSync.GetKnifeFromDatabase(playerIndex);
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null) return;
+
+			Task.Run(async () =>
+			{
+				if (Config.Additional.SkinEnabled)
+					await weaponSync.GetKnifeFromDatabase(playerInfo);
+			});
+
+			//if (Config.Additional.KnifeEnabled && weaponSync != null)
+			//_ = weaponSync.GetKnifeFromDatabase(playerIndex);
 		}
 
 		private void OnClientDisconnect(int playerSlot)
@@ -111,6 +124,8 @@ namespace WeaponPaints
 
 				if (Config.GlobalShare)
 					GlobalShareConnect();
+
+				weaponSync = new WeaponSynchronization(DatabaseConnectionString, Config, GlobalShareApi, GlobalShareServerId);
 			});
 
 			g_hTimerCheckSkinsData = AddTimer(10.0f, () =>
@@ -122,27 +137,49 @@ namespace WeaponPaints
 					if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.AuthorizedSteamID == null) continue;
 					if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
 
+					PlayerInfo playerInfo = new PlayerInfo
+					{
+						UserId = player.UserId,
+						Index = (int)player.Index,
+						SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+						Name = player?.PlayerName,
+						IpAddress = player?.IpAddress?.Split(":")[0]
+					};
+
 					if (Config.Additional.SkinEnabled && weaponSync != null)
-						_ = weaponSync.GetWeaponPaintsFromDatabase((int)player.Index);
+						_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
 					if (Config.Additional.KnifeEnabled && weaponSync != null)
-						_ = weaponSync.GetKnifeFromDatabase((int)player.Index);
+						_ = weaponSync.GetKnifeFromDatabase(playerInfo);
 				}
 			}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE | CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
+
 		}
 
 		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))
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null) return HookResult.Continue;
+
+			PlayerInfo playerInfo = new PlayerInfo
+			{
+				UserId = player.UserId,
+				Index = (int)player.Index,
+				SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+				Name = player?.PlayerName,
+				IpAddress = player?.IpAddress?.Split(":")[0]
+			};
+
+			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);
-
+				Task.Run(async () =>
+				{
+					if (Config.Additional.SkinEnabled)
+						await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+					if (Config.Additional.KnifeEnabled)
+						await weaponSync.GetKnifeFromDatabase(playerInfo);
+				});
 			}
 
 			return HookResult.Continue;
@@ -171,6 +208,7 @@ namespace WeaponPaints
 			return HookResult.Continue;
 		}
 
+
 		private HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info)
 		{
 			g_bCommandsAllowed = false;

PlayerInfo.cs

@@ -0,0 +1,11 @@
+namespace WeaponPaints
+{
+	public class PlayerInfo
+	{
+		public int Index { get; set; }
+		public int? UserId { get; set; }
+		public string? SteamId { get; set; }
+		public string? Name { get; set; }
+		public string? IpAddress { get; set; }
+	}
+}

WeaponAction.cs

@@ -2,6 +2,7 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.Logging;
 
 namespace WeaponPaints
 {
@@ -81,7 +82,7 @@ namespace WeaponPaints
 		{
 			if (!_config.Additional.KnifeEnabled) return false;
 
-			if (player == null || !player.IsValid || !player.PlayerPawn.IsValid)
+			if (player == null || !player.IsValid || player.PlayerPawn == null || !player.PlayerPawn.IsValid || !player.PawnIsAlive)
 			{
 				return false;
 			}
@@ -221,6 +222,7 @@ namespace WeaponPaints
 						}
 						catch (Exception ex)
 						{
+							Logger.LogWarning("Refreshing weapons exception");
 							Console.WriteLine("[WeaponPaints] Refreshing weapons exception");
 							Console.WriteLine(ex.Message);
 						}
@@ -240,6 +242,7 @@ namespace WeaponPaints
 			if (weapons != null && weapons.Count > 0)
 			{
 				CCSPlayer_ItemServices service = new CCSPlayer_ItemServices(player.PlayerPawn.Value.ItemServices.Handle);
+				//var dropWeapon = VirtualFunction.CreateVoid<nint, nint>(service.Handle, GameData.GetOffset("CCSPlayer_ItemServices_DropActivePlayerWeapon"));
 
 				foreach (var weapon in weapons)
 				{

WeaponPaints.cs

@@ -3,10 +3,11 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
 using CounterStrikeSharp.API.Modules.Cvars;
 using Newtonsoft.Json.Linq;
+using Microsoft.Extensions.Logging;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(90)]
+[MinimumApiVersion(101)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static readonly Dictionary<string, string> weaponList = new()
@@ -142,7 +143,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.3c";
+	public override string ModuleVersion => "1.3d";
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
 		return _config;
@@ -156,22 +157,34 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 			Utility.TestDatabaseConnection();
 		}
 
-		weaponSync = new WeaponSynchronization(DatabaseConnectionString, Config, GlobalShareApi, GlobalShareServerId);
-
 		if (hotReload)
 		{
 			OnMapStart(string.Empty);
-			Task.Run(async () =>
-			{
-				for (int i = 1; i <= Server.MaxPlayers; i++)
-				{
-					if (Config.Additional.SkinEnabled && weaponSync != null)
-						await weaponSync.GetWeaponPaintsFromDatabase(i);
 
-					if (Config.Additional.KnifeEnabled && weaponSync != null)
-						await weaponSync.GetKnifeFromDatabase(i);
-				}
-			});
+			List<CCSPlayerController> players = Utilities.GetPlayers();
+
+			foreach (CCSPlayerController player in players)
+			{
+				if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || player.AuthorizedSteamID == null) continue;
+				if (gPlayerWeaponsInfo.ContainsKey((int)player.Index)) continue;
+
+				PlayerInfo playerInfo = new PlayerInfo
+				{
+					UserId = player.UserId,
+					Index = (int)player.Index,
+					SteamId = player?.AuthorizedSteamID?.SteamId64.ToString(),
+					Name = player?.PlayerName,
+					IpAddress = player?.IpAddress?.Split(":")[0]
+				};
+
+				if (Config.Additional.SkinEnabled && weaponSync != null)
+					_ = weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+				if (Config.Additional.KnifeEnabled && weaponSync != null)
+					_ = weaponSync.GetKnifeFromDatabase(playerInfo);
+			}
+
+			RegisterListeners();
+			RegisterCommands();
 		}
 
 		if (Config.Additional.KnifeEnabled)
@@ -191,6 +204,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{
 			if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)
 			{
+				Logger.LogError("You need to setup Database credentials in config!");
 				throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
 			}
 		}
@@ -234,9 +248,12 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 			}
 			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");
 	}
 }

WeaponSynchronization.cs

@@ -21,24 +21,21 @@ namespace WeaponPaints
 			_globalShareServerId = globalShareServerId;
 		}
 
-		internal async Task GetKnifeFromDatabase(int playerIndex)
+		internal async Task GetKnifeFromDatabase(PlayerInfo player)
 		{
 			if (!_config.Additional.KnifeEnabled) return;
+			if (player.SteamId == null || player.Index == 0) return;
 			try
 			{
-				CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
-				if (!Utility.IsPlayerValid(player)) return;
-				if (player.AuthorizedSteamID == null) return;
-				string steamId = player.AuthorizedSteamID.SteamId64.ToString();
-
 				if (_config.GlobalShare)
 				{
 					var values = new Dictionary<string, string>
 				{
 				   { "server_id", _globalShareServerId.ToString() },
-				   { "steamid", steamId },
+				   { "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)}"));
 
@@ -53,7 +50,7 @@ namespace WeaponPaints
 							string result = await response.Content.ReadAsStringAsync();
 							if (!string.IsNullOrEmpty(result))
 							{
-								WeaponPaints.g_playersKnife[playerIndex] = result;
+								WeaponPaints.g_playersKnife[player.Index] = result;
 							}
 							else
 							{
@@ -72,10 +69,11 @@ namespace WeaponPaints
 				{
 					await connection.OpenAsync();
 					string query = "SELECT `knife` FROM `wp_player_knife` WHERE `steamid` = @steamid";
-					string? PlayerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = steamId });
+					string? PlayerKnife = await connection.QueryFirstOrDefaultAsync<string>(query, new { steamid = player.SteamId });
+
 					if (PlayerKnife != null)
 					{
-						WeaponPaints.g_playersKnife[playerIndex] = PlayerKnife;
+						WeaponPaints.g_playersKnife[player.Index] = PlayerKnife;
 					}
 					else
 					{
@@ -91,20 +89,14 @@ namespace WeaponPaints
 			}
 		}
 
-		internal async Task GetWeaponPaintsFromDatabase(int playerIndex)
+		internal async Task GetWeaponPaintsFromDatabase(PlayerInfo player)
 		{
 			if (!_config.Additional.SkinEnabled) return;
+			if (player.SteamId == null || player.Index == 0) return;
 
-			CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
-			if (!Utility.IsPlayerValid(player)) return;
-
-			if (player.AuthorizedSteamID == null) return;
-
-			string steamId = player.AuthorizedSteamID.SteamId64.ToString();
-
-			if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(playerIndex, out _))
+			if (!WeaponPaints.gPlayerWeaponsInfo.TryGetValue(player.Index, out _))
 			{
-				WeaponPaints.gPlayerWeaponsInfo[playerIndex] = new Dictionary<int, WeaponInfo>();
+				WeaponPaints.gPlayerWeaponsInfo[player.Index] = new Dictionary<int, WeaponInfo>();
 			}
 			try
 			{
@@ -113,7 +105,7 @@ namespace WeaponPaints
 					var values = new Dictionary<string, string>
 				{
 				   { "server_id", _globalShareServerId.ToString() },
-				   { "steamid", steamId },
+				   { "steamid", player.SteamId },
 				   { "skins", "1" }
 				};
 					UriBuilder builder = new UriBuilder(_globalShareApi);
@@ -146,7 +138,7 @@ namespace WeaponPaints
 											Seed = weaponSeed.Value,
 											Wear = weaponWear.Value
 										};
-										WeaponPaints.gPlayerWeaponsInfo[playerIndex][weaponDefIndex.Value] = weaponInfo;
+										WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex.Value] = weaponInfo;
 									}
 								}
 							}
@@ -164,7 +156,7 @@ namespace WeaponPaints
 					await connection.OpenAsync();
 
 					string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
-					IEnumerable<dynamic> PlayerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = steamId });
+					IEnumerable<dynamic> PlayerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
 
 					if (PlayerSkins != null && PlayerSkins.AsList().Count > 0)
 					{
@@ -181,7 +173,7 @@ namespace WeaponPaints
 								Seed = weaponSeed,
 								Wear = weaponWear
 							};
-							WeaponPaints.gPlayerWeaponsInfo[playerIndex][weaponDefIndex] = weaponInfo;
+							WeaponPaints.gPlayerWeaponsInfo[player.Index][weaponDefIndex] = weaponInfo;
 						});
 					}
 					else
@@ -198,20 +190,17 @@ namespace WeaponPaints
 			}
 		}
 
-		internal async Task SyncKnifeToDatabase(int playerIndex, string knife)
+		internal async Task SyncKnifeToDatabase(PlayerInfo player, string knife)
 		{
 			if (!_config.Additional.KnifeEnabled) return;
 			try
 			{
-				CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
-				if (player == null || !player.IsValid) return;
-				if (player.AuthorizedSteamID == null) return;
-				string steamId = player.AuthorizedSteamID.SteamId64.ToString();
+				if (player.SteamId == null || player.Index == 0) return;
 
 				using var connection = new MySqlConnection(_databaseConnectionString);
 				await connection.OpenAsync();
 				string query = "INSERT INTO `wp_player_knife` (`steamid`, `knife`) VALUES(@steamid, @newKnife) ON DUPLICATE KEY UPDATE `knife` = @newKnife";
-				await connection.ExecuteAsync(query, new { steamid = steamId, newKnife = knife });
+				await connection.ExecuteAsync(query, new { steamid = player.SteamId, newKnife = knife });
 				await connection.CloseAsync();
 			}
 			catch (Exception e)