Merge 9d96b75ca4 into b5d7f12024

Commands.cs

@@ -153,15 +153,18 @@ public partial class WeaponPaints
 	{
 		if (player == null || !player.IsValid) return;
 		
+		if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var teamInfo) || 
+		    !teamInfo.TryGetValue(player.Team, out var teamWeapons) )
+			return;
+		
 		var weapon = player.PlayerPawn.Value?.WeaponServices?.ActiveWeapon.Value;
 		
 		if (weapon == null || !weapon.IsValid)
 			return;
-
-		if (!HasChangedPaint(player, weapon.AttributeManager.Item.ItemDefinitionIndex, out var weaponInfo) || weaponInfo == null)
+		if (!teamWeapons.TryGetValue(weapon.AttributeManager.Item.ItemDefinitionIndex, out var teamWeapon))
 			return;
-		
-		weaponInfo.StatTrak = !weaponInfo.StatTrak;
+
+		teamWeapon.StatTrak = !teamWeapon.StatTrak;
 		RefreshWeapons(player);
 
 		if (!string.IsNullOrEmpty(Localizer["wp_stattrak_action"]))
@@ -334,7 +337,7 @@ public partial class WeaponPaints
 						value.Seed = 0;
 					}
 
-					var playerInfo = new PlayerInfo
+					PlayerInfo playerInfo = new PlayerInfo
 					{
 						UserId = p.UserId,
 						Slot = p.Slot,

Events.cs

@@ -2,6 +2,7 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Entities;
+using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 
@@ -193,7 +194,7 @@ namespace WeaponPaints
 			return HookResult.Continue;
 		}
 
-		private HookResult OnGiveNamedItemPost(DynamicHook hook)
+		public HookResult OnGiveNamedItemPost(DynamicHook hook)
 		{
 			try
 			{
@@ -205,7 +206,15 @@ namespace WeaponPaints
 				var player = GetPlayerFromItemServices(itemServices);
 				if (player != null)
 				{
+					var weaponServices = player.PlayerPawn.Value?.WeaponServices;
+					
 					GivePlayerWeaponSkin(player, weapon);
+					
+					if (weaponServices is { MyWeapons.Count: 1 })
+					{
+						// player.GiveNamedItem(CsItem.Healthshot);
+						// newWeapon.AddEntityIOEvent("Kill", newWeapon, null, "", 0.1f);
+					}
 				}
 			}
 			catch { }
@@ -213,7 +222,7 @@ namespace WeaponPaints
 			return HookResult.Continue;
 		}
 
-		private void OnEntityCreated(CEntityInstance entity)
+		public void OnEntityCreated(CEntityInstance entity)
 		{
 			var designerName = entity.DesignerName;
 
@@ -280,15 +289,9 @@ namespace WeaponPaints
 		{
 			// if (!IsWindows) return HookResult.Continue;
 			var player = @event.Userid;
-			if (player == null || !player.IsValid || player.IsBot) return HookResult.Continue;
 			if (!@event.Item.Contains("knife")) return HookResult.Continue;
-
-			var weaponDefIndex = (int)@event.Defindex;
-				
-			if (!HasChangedKnife(player, out var _) || !HasChangedPaint(player, weaponDefIndex, out var _))
-				return HookResult.Continue;
 			
-			if (player is { Connected: PlayerConnectedState.PlayerConnected, PawnIsAlive: true, PlayerPawn.IsValid: true })
+			if (player != null && player is { IsValid: true, Connected: PlayerConnectedState.PlayerConnected, PawnIsAlive: true, PlayerPawn.IsValid: true })
 			{
 				GiveOnItemPickup(player);
 			}
@@ -306,16 +309,20 @@ namespace WeaponPaints
 			
 			if (victim == null || !victim.IsValid || victim == player)
 				return HookResult.Continue;
-			
+
+			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var teamInfo) || 
+			    !teamInfo.TryGetValue(player.Team, out var teamWeapons) )
+				return HookResult.Continue;
+
 			CBasePlayerWeapon? weapon = player.PlayerPawn.Value?.WeaponServices?.ActiveWeapon.Value;
 
 			if (weapon == null) return HookResult.Continue;
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
-			if (!HasChangedPaint(player, weaponDefIndex, out var weaponInfo) || weaponInfo == null)
+			if (!teamWeapons.TryGetValue(weaponDefIndex, out var weaponInfo) || weaponInfo.Paint == 0)
 				return HookResult.Continue;
-				
+			
 			if (!weaponInfo.StatTrak) return HookResult.Continue;
 			
 			weaponInfo.StatTrakCount += 1;

VERSION

@@ -1 +1 @@
-3.1c
+3.1b

Variables.cs

@@ -78,6 +78,7 @@ public partial class WeaponPaints
 	internal static readonly ConcurrentDictionary<int, ConcurrentDictionary<CsTeam, ushort>> GPlayersMusic = new();
 	internal static readonly ConcurrentDictionary<int, ConcurrentDictionary<CsTeam, ushort>> GPlayersPin = new();
 	internal static readonly ConcurrentDictionary<int, (string? CT, string? T)> GPlayersAgent = new();
+	internal static readonly Dictionary<int, int> GPlayersKnivesPickup = [];
 	internal static readonly ConcurrentDictionary<int, ConcurrentDictionary<CsTeam, ConcurrentDictionary<int, WeaponInfo>>> GPlayerWeaponsInfo = new();
 	internal static List<JObject> SkinsList = [];
 	internal static List<JObject> PinsList = [];

WeaponAction.cs

@@ -20,30 +20,29 @@ namespace WeaponPaints
 
 			bool isKnife = weapon.DesignerName.Contains("knife") || weapon.DesignerName.Contains("bayonet");
 
-			switch (isKnife)
+			if (isKnife && (!GPlayersKnife.ContainsKey(player.Slot) ||
+			                !GPlayersKnife[player.Slot].ContainsKey(player.Team) ||
+			                GPlayersKnife[player.Slot][player.Team] == "weapon_knife"))
+				return;
+
+			if (isKnife)
 			{
-				case true when !HasChangedKnife(player, out var _):
-					return;
-				
-				case true:
+				var newDefIndex = WeaponDefindex.FirstOrDefault(x => x.Value == GPlayersKnife[player.Slot][player.Team]);
+				if (newDefIndex.Key == 0) return;
+
+				if (weapon.AttributeManager.Item.ItemDefinitionIndex != newDefIndex.Key)
 				{
-					var newDefIndex = WeaponDefindex.FirstOrDefault(x => x.Value == GPlayersKnife[player.Slot][player.Team]);
-					if (newDefIndex.Key == 0) return;
-
-					if (weapon.AttributeManager.Item.ItemDefinitionIndex != newDefIndex.Key)
-					{
-						SubclassChange(weapon, (ushort)newDefIndex.Key);
-					}
-
-					weapon.AttributeManager.Item.ItemDefinitionIndex = (ushort)newDefIndex.Key;
-					weapon.AttributeManager.Item.EntityQuality = 3;
-					break;
+					SubclassChange(weapon, (ushort)newDefIndex.Key);
 				}
-				default:
-					weapon.AttributeManager.Item.EntityQuality = 0;
-					break;
-			}
 
+				weapon.AttributeManager.Item.ItemDefinitionIndex = (ushort)newDefIndex.Key;
+				weapon.AttributeManager.Item.EntityQuality = 3;
+			}
+			else
+			{
+				weapon.AttributeManager.Item.EntityQuality = 0;
+			}
+			
 			UpdatePlayerEconItemId(weapon.AttributeManager.Item);
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
@@ -55,7 +54,9 @@ namespace WeaponPaints
 			bool isLegacyModel;
 
 			if (_config.Additional.GiveRandomSkin &&
-			    !HasChangedPaint(player, weaponDefIndex, out _))
+			    GPlayerWeaponsInfo.ContainsKey(player.Slot) &&
+			    (!GPlayerWeaponsInfo[player.Slot].ContainsKey(player.Team) ||
+			     !GPlayerWeaponsInfo[player.Slot][player.Team].ContainsKey(weaponDefIndex)))
 			{
 				// Random skins
 				weapon.FallbackPaintKit = GetRandomPaint(weaponDefIndex);
@@ -88,9 +89,13 @@ namespace WeaponPaints
 				return;
 			}
 
-			if (!HasChangedPaint(player, weaponDefIndex, out var weaponInfo) || weaponInfo == null)
+			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var teamInfo) || 
+			    !teamInfo.TryGetValue(player.Team, out var teamWeapons) )
+				return;
+			if (!teamWeapons.TryGetValue(weaponDefIndex, out var value))
 				return;
 
+			var 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.AttributeList.Attributes.RemoveAll();
@@ -141,7 +146,9 @@ namespace WeaponPaints
 		private void IncrementWearForWeaponWithStickers(CCSPlayerController player, CBasePlayerWeapon weapon)
 		{
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
-			if (!HasChangedPaint(player, weaponDefIndex, out var weaponInfo) || weaponInfo == null ||
+			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var playerWeapons) ||
+			    !playerWeapons.TryGetValue(player.Team, out var weaponInfoDict) ||
+			    !weaponInfoDict.TryGetValue(weaponDefIndex, out var weaponInfo) ||
 			    weaponInfo.Stickers.Count <= 0) return;
 			
 			float wearIncrement = 0.001f;
@@ -164,8 +171,11 @@ namespace WeaponPaints
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
-			if (!HasChangedPaint(player ,weaponDefIndex, out var weaponInfo) || weaponInfo == null)
+			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var playerWeapons) ||
+			    !playerWeapons[player.Team].TryGetValue(weaponDefIndex, out var weaponInfo))
+			{
 				return;
+			}
 
 			foreach (var sticker in weaponInfo.Stickers)
 			{
@@ -201,7 +211,10 @@ namespace WeaponPaints
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
 
-			if (!HasChangedPaint(player, weaponDefIndex, out var value) || value?.KeyChain == null)
+			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var playerWeaponsInfo) ||
+			    !playerWeaponsInfo.TryGetValue(player.Team, out var teamWeaponsInfo) ||
+			    !teamWeaponsInfo.TryGetValue(weaponDefIndex, out var value) ||
+			    value.KeyChain == null)
 				return;
 			
 			var keyChain = value.KeyChain;
@@ -393,7 +406,9 @@ namespace WeaponPaints
 					if (!GPlayersGlove.TryGetValue(player.Slot, out var gloveInfo) ||
 					    !gloveInfo.TryGetValue(player.Team, out var gloveId) ||
 					    gloveId == 0 ||
-					    !HasChangedPaint(player, gloveId, out var weaponInfo) || weaponInfo == null)
+					    !GPlayerWeaponsInfo.TryGetValue(player.Slot, out var playerWeaponsInfo) ||
+					    !playerWeaponsInfo.TryGetValue(player.Team, out var teamWeaponsInfo) ||
+					    !teamWeaponsInfo.TryGetValue(gloveId, out var weaponInfo))
 						return;
 
 					item.ItemDefinitionIndex = gloveId;
@@ -568,36 +583,6 @@ namespace WeaponPaints
 			return viewModel.Value == null ? null : viewModel.Value;
 		}
 
-		private static bool HasChangedKnife(CCSPlayerController player, out string? knifeValue)
-		{
-			knifeValue = null;
-
-			// Check if player has knife info for their slot and team
-			if (!GPlayersKnife.TryGetValue(player.Slot, out var knife) ||
-			    !knife.TryGetValue(player.Team, out var value) ||
-			    value == "weapon_knife") return false;
-			knifeValue = value; // Assign the knife value to the out parameter
-			return true;
-		}
-		
-		private static bool HasChangedPaint(CCSPlayerController player, int weaponDefIndex, out WeaponInfo? weaponInfo)
-		{
-			weaponInfo = null;
-
-			// Check if player has weapons info for their slot and team
-			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var teamInfo) || 
-			    !teamInfo.TryGetValue(player.Team, out var teamWeapons))
-			{
-				return false;
-			}
-
-			// Check if the specified weapon has a paint/skin change
-			if (!teamWeapons.TryGetValue(weaponDefIndex, out var value) || value.Paint <= 0) return false;
-			
-			weaponInfo = value; // Assign the out variable when it exists
-			return true;
-		}
-
 		private static float ViewAsFloat(uint value)
 		{
 			return BitConverter.Int32BitsToSingle((int)value);

WeaponPaints.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
+using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using Microsoft.Extensions.Logging;
 using MySqlConnector;
 
@@ -16,7 +17,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 => "3.1c";
+	public override string ModuleVersion => "3.1b";
 
 	public override void Load(bool hotReload)
 	{
@@ -39,6 +40,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 					         !string.IsNullOrEmpty(player.IpAddress) && player is
 						         { IsBot: false, Connected: PlayerConnectedState.PlayerConnected }))
 			{
+				GPlayersKnivesPickup[player.Slot] = 0;
 				var playerInfo = new PlayerInfo
 				{
 					UserId = player.UserId,

WeaponSynchronization.cs

@@ -49,7 +49,7 @@ internal class WeaponSynchronization
 			if (!_config.Additional.KnifeEnabled || string.IsNullOrEmpty(player?.SteamId))
 				return;
 
-			const string query = "SELECT `knife`, `weapon_team` FROM `wp_player_knife` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
+			const string query = "SELECT `knife`, `weapon_team` FROM `wp_player_knife` WHERE `steamid` = @steamid";
 			var rows = connection.Query<dynamic>(query, new { steamid = player.SteamId }); // Retrieve all records for the player
 
 			foreach (var row in rows)
@@ -60,9 +60,9 @@ internal class WeaponSynchronization
 				// Determine the weapon team based on the query result
 				CsTeam weaponTeam = (int)row.weapon_team switch
 				{
+					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					3 => CsTeam.CounterTerrorist,
-					_ => CsTeam.None,
+					_ => CsTeam.CounterTerrorist
 				};
 
 				// Get or create entries for the player’s slot
@@ -94,7 +94,7 @@ internal class WeaponSynchronization
 			if (!_config.Additional.GloveEnabled || string.IsNullOrEmpty(player?.SteamId))
 				return;
 
-			const string query = "SELECT `weapon_defindex`, `weapon_team` FROM `wp_player_gloves` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
+			const string query = "SELECT `weapon_defindex`, `weapon_team` FROM `wp_player_gloves` WHERE `steamid` = @steamid";
 			var rows = connection.Query<dynamic>(query, new { steamid = player.SteamId }); // Retrieve all records for the player
 
 			foreach (var row in rows)
@@ -105,9 +105,9 @@ internal class WeaponSynchronization
 				var playerGloves = WeaponPaints.GPlayersGlove.GetOrAdd(player.Slot, _ => new ConcurrentDictionary<CsTeam, ushort>());
 				CsTeam weaponTeam = (int)row.weapon_team switch
 				{
+					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					3 => CsTeam.CounterTerrorist,
-					_ => CsTeam.None,
+					_ => CsTeam.CounterTerrorist
 				};
 
 				// Get or create entries for the player’s slot
@@ -171,27 +171,28 @@ internal class WeaponSynchronization
 
 			// var weaponInfos = new ConcurrentDictionary<int, WeaponInfo>();
 
-			const string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
+			const string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
 			var playerSkins = connection.Query<dynamic>(query, new { steamid = player.SteamId });
 
 			foreach (var row in playerSkins)
 			{
-				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;
-				string weaponNameTag = row.weapon_nametag ?? "";
-				bool weaponStatTrak = row.weapon_stattrak ?? false;
-				int weaponStatTrakCount = row.weapon_stattrak_count ?? 0;
+				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;
+				string weaponNameTag = row?.weapon_nametag ?? "";
+				bool weaponStatTrak = row?.weapon_stattrak ?? false;
+				int weaponStatTrakCount = row?.weapon_stattrak_count ?? 0;
 				
-				CsTeam weaponTeam = row.weapon_team switch
+				CsTeam weaponTeam = row?.weapon_team switch
 				{
+					null => CsTeam.None,
+					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					3 => CsTeam.CounterTerrorist,
-					_ => CsTeam.None,
+					_ => CsTeam.CounterTerrorist
 				};
 						
-				string[]? keyChainParts = row.weapon_keychain?.ToString().Split(';');
+				string[]? keyChainParts = row?.weapon_keychain?.ToString().Split(';');
 
 				KeyChainInfo keyChainInfo = new KeyChainInfo();
 
@@ -301,7 +302,7 @@ internal class WeaponSynchronization
 			if (!_config.Additional.MusicEnabled || string.IsNullOrEmpty(player?.SteamId))
 				return;
 
-			const string query = "SELECT `music_id`, `weapon_team` FROM `wp_player_music` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
+			const string query = "SELECT `music_id`, `weapon_team` FROM `wp_player_music` WHERE `steamid` = @steamid";
 			var rows = connection.Query<dynamic>(query, new { steamid = player.SteamId }); // Retrieve all records for the player
 
 			foreach (var row in rows)
@@ -312,9 +313,9 @@ internal class WeaponSynchronization
 				// Determine the weapon team based on the query result
 				CsTeam weaponTeam = (int)row.weapon_team switch
 				{
+					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					3 => CsTeam.CounterTerrorist,
-					_ => CsTeam.None,
+					_ => CsTeam.CounterTerrorist
 				};
 
 				// Get or create entries for the player’s slot
@@ -346,7 +347,7 @@ internal class WeaponSynchronization
 			if (string.IsNullOrEmpty(player?.SteamId))
 				return;
 
-			const string query = "SELECT `id`, `weapon_team` FROM `wp_player_pins` WHERE `steamid` = @steamid ORDER BY `weapon_team` ASC";
+			const string query = "SELECT `id`, `weapon_team` FROM `wp_player_pins` WHERE `steamid` = @steamid";
 			var rows = connection.Query<dynamic>(query, new { steamid = player.SteamId }); // Retrieve all records for the player
 
 			foreach (var row in rows)
@@ -357,9 +358,9 @@ internal class WeaponSynchronization
 				// Determine the weapon team based on the query result
 				CsTeam weaponTeam = (int)row.weapon_team switch
 				{
+					0 => CsTeam.None,
 					2 => CsTeam.Terrorist,
-					3 => CsTeam.CounterTerrorist,
-					_ => CsTeam.None,
+					_ => CsTeam.CounterTerrorist
 				};
 
 				// Get or create entries for the player’s slot