Merge pull request #222 from daffyyyy/main

2.3b

Commands.cs

@@ -471,60 +471,62 @@ namespace WeaponPaints
 				if (!Utility.IsPlayerValid(player) || player is null) return;
 
 				string selectedPaintName = option.Text;
+				var selectedAgent = agentsList.FirstOrDefault(g =>
+					g.ContainsKey("agent_name") &&
+					g["agent_name"] != null && g["agent_name"]!.ToString() == selectedPaintName &&
+					g["team"] != null && (int)(g["team"]!) == player.TeamNum);
 
-				var selectedAgent = agentsList.FirstOrDefault(g => g.ContainsKey("agent_name") && g["agent_name"]?.ToString() == selectedPaintName);
+				if (selectedAgent == null) return;
-				if (selectedAgent != null)
+
+				if (
+					selectedAgent != null &&
+					selectedAgent.ContainsKey("model")
+				)
 				{
-					if (
+					PlayerInfo playerInfo = new PlayerInfo
-						selectedAgent != null &&
-						selectedAgent.ContainsKey("model")
-					)
 					{
-						PlayerInfo playerInfo = new PlayerInfo
+						UserId = player.UserId,
-						{
+						Slot = player.Slot,
-							UserId = player.UserId,
+						Index = (int)player.Index,
-							Slot = player.Slot,
+						SteamId = player.SteamID.ToString(),
-							Index = (int)player.Index,
+						Name = player.PlayerName,
-							SteamId = player.SteamID.ToString(),
+						IpAddress = player.IpAddress?.Split(":")[0]
-							Name = player.PlayerName,
-							IpAddress = player.IpAddress?.Split(":")[0]
-						};
-
-						if (Config.Additional.ShowSkinImage)
-						{
-							string image = selectedAgent["image"]?.ToString() ?? "";
-							PlayerWeaponImage[player.Slot] = image;
-							AddTimer(2.0f, () => PlayerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
-						}
-
-						if (!string.IsNullOrEmpty(Localizer["wp_agent_menu_select"]))
-						{
-							player!.Print(Localizer["wp_agent_menu_select", selectedPaintName]);
-						}
-
-						if (player.TeamNum == 3)
-						{
-							g_playersAgent.AddOrUpdate(player.Slot,
-							key => (selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString(), null),
-							(key, oldValue) => (selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString(), oldValue.T));
-						}
-						else
-						{
-							g_playersAgent.AddOrUpdate(player.Slot,
-								key => (null, selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString()),
-								(key, oldValue) => (oldValue.CT, selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString())
-							);
-						}
-
-						if (weaponSync != null)
-						{
-							_ = Task.Run(async () =>
-							{
-								await weaponSync.SyncAgentToDatabase(playerInfo);
-							});
-						}
 					};
-				}
+
+					if (Config.Additional.ShowSkinImage)
+					{
+						string image = selectedAgent["image"]?.ToString() ?? "";
+						PlayerWeaponImage[player.Slot] = image;
+						AddTimer(2.0f, () => PlayerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
+					}
+
+					if (!string.IsNullOrEmpty(Localizer["wp_agent_menu_select"]))
+					{
+						player!.Print(Localizer["wp_agent_menu_select", selectedPaintName]);
+					}
+
+					if (player.TeamNum == 3)
+					{
+						g_playersAgent.AddOrUpdate(player.Slot,
+						key => (selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString(), null),
+						(key, oldValue) => (selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString(), oldValue.T));
+					}
+					else
+					{
+						g_playersAgent.AddOrUpdate(player.Slot,
+							key => (null, selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString()),
+							(key, oldValue) => (oldValue.CT, selectedAgent["model"]!.ToString().Equals("null") ? null : selectedAgent["model"]!.ToString())
+						);
+					}
+
+					if (weaponSync != null)
+					{
+						_ = Task.Run(async () =>
+						{
+							await weaponSync.SyncAgentToDatabase(playerInfo);
+						});
+					}
+				};
 			};
 
 			// Command to open the weapon selection menu for players

Events.cs

@@ -160,9 +160,9 @@ namespace WeaponPaints
 				return;
 			}
 
-			if (!gPlayerWeaponsInfo[player.Slot].ContainsKey(weaponDefIndex) || gPlayerWeaponsInfo[player.Slot][weaponDefIndex].Paint == 0) return;
+			if (!gPlayerWeaponsInfo[player.Slot].TryGetValue(weaponDefIndex, out WeaponInfo? value) || value.Paint == 0) return;
 
-			WeaponInfo weaponInfo = gPlayerWeaponsInfo[player.Slot][weaponDefIndex];
+			WeaponInfo weaponInfo = value;
 			//Log($"Apply on {weapon.DesignerName}({weapon.AttributeManager.Item.ItemDefinitionIndex}) paint {gPlayerWeaponPaints[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} seed {gPlayerWeaponSeed[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} wear {gPlayerWeaponWear[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]}");
 			weapon.AttributeManager.Item.ItemID = 16384;
 			weapon.AttributeManager.Item.ItemIDLow = 16384 & 0xFFFFFFFF;
@@ -257,7 +257,7 @@ namespace WeaponPaints
 		}
 		*/
 
-		public void OnEntityCreated(CEntityInstance entity)
+		public void OnEntitySpawned(CEntityInstance entity)
 		{
 			var designerName = entity.DesignerName;
 
@@ -326,7 +326,7 @@ namespace WeaponPaints
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
-			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
+			RegisterListener<Listeners.OnEntitySpawned>(OnEntitySpawned);
 			RegisterListener<Listeners.OnTick>(OnTick);
 			//VirtualFunctions.GiveNamedItemFunc.Hook(OnGiveNamedItemPost, HookMode.Post);
 		}

VERSION

@@ -1 +1 @@
-2.3a
+2.3b

WeaponAction.cs

@@ -99,12 +99,13 @@ namespace WeaponPaints
 						int clip1 = weapon.Value.Clip1;
 						int reservedAmmo = weapon.Value.ReserveAmmo[0];
 
-						if (!weaponsWithAmmo.ContainsKey(weaponByDefindex))
+						if (!weaponsWithAmmo.TryGetValue(weaponByDefindex, out List<(int, int)>? value))
 						{
-							weaponsWithAmmo.Add(weaponByDefindex, new List<(int, int)>());
+							value = new List<(int, int)>();
+							weaponsWithAmmo.Add(weaponByDefindex, value);
 						}
 
-						weaponsWithAmmo[weaponByDefindex].Add((clip1, reservedAmmo));
+						value.Add((clip1, reservedAmmo));
 
 						if (gun == null || gun.VData == null) return;
 

WeaponPaints.cs

@@ -10,7 +10,7 @@ using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(191)]
+[MinimumApiVersion(195)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static WeaponPaints Instance { get; private set; } = new();
@@ -75,23 +75,23 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 		{ "weapon_knife_kukri", "Kukri Knife" }
 	};
 
-	internal static WeaponPaintsConfig _config = new WeaponPaintsConfig();
+	internal static WeaponPaintsConfig _config = new();
 	internal static IStringLocalizer? _localizer;
-	internal static Dictionary<int, int> g_knifePickupCount = new Dictionary<int, int>();
+	internal static Dictionary<int, int> g_knifePickupCount = new();
-	internal static ConcurrentDictionary<int, string> g_playersKnife = new ConcurrentDictionary<int, string>();
+	internal static ConcurrentDictionary<int, string> g_playersKnife = new();
-	internal static ConcurrentDictionary<int, ushort> g_playersGlove = new ConcurrentDictionary<int, ushort>();
+	internal static ConcurrentDictionary<int, ushort> g_playersGlove = new();
-	internal static ConcurrentDictionary<int, ushort> g_playersMusic = new ConcurrentDictionary<int, ushort>();
+	internal static ConcurrentDictionary<int, ushort> g_playersMusic = new();
-	internal static ConcurrentDictionary<int, (string? CT, string? T)> g_playersAgent = new ConcurrentDictionary<int, (string?, string?)>();
+	internal static ConcurrentDictionary<int, (string? CT, string? T)> g_playersAgent = new();
-	internal static ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>>();
+	internal static ConcurrentDictionary<int, ConcurrentDictionary<int, WeaponInfo>> gPlayerWeaponsInfo = new();
-	internal static List<JObject> skinsList = new List<JObject>();
+	internal static List<JObject> skinsList = new();
-	internal static List<JObject> glovesList = new List<JObject>();
+	internal static List<JObject> glovesList = new();
-	internal static List<JObject> agentsList = new List<JObject>();
+	internal static List<JObject> agentsList = new();
-	internal static List<JObject> musicList = new List<JObject>();
+	internal static List<JObject> musicList = new();
 	internal static WeaponSynchronization? weaponSync;
 	public static bool g_bCommandsAllowed = true;
 	internal Dictionary<int, string> PlayerWeaponImage = new();
 
-	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
+	internal static Dictionary<int, DateTime> commandsCooldown = new();
 	internal static Database? _database;
 
 	internal static MemoryFunctionVoid<nint, string, float> CAttributeList_SetOrAddAttributeValueByName = new(GameData.GetSignature("CAttributeList_SetOrAddAttributeValueByName"));
@@ -160,7 +160,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin, gloves, agents and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "2.3a";
+	public override string ModuleVersion => "2.3b";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -177,7 +177,10 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 			foreach (var player in Utilities.GetPlayers())
 			{
-				if (weaponSync == null || player is null || !player.IsValid || player.SteamID.ToString().Length != 17 || player.IsBot ||
+				if (weaponSync == null)
+					break;
+
+				if (player is null || !player.IsValid || player.SteamID.ToString().Length != 17 || string.IsNullOrEmpty(player.IpAddress) || player.IsBot ||
 					player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
 					continue;