Merge pull request #206 from daffyyyy/main

2.2d

Commands.cs

@@ -96,6 +96,12 @@ namespace WeaponPaints
 					player!.Print(Localizer["wp_info_glove"]);
 				}
 
+			if (Config.Additional.AgentEnabled)
+				if (!string.IsNullOrEmpty(Localizer["wp_info_agent"]))
+				{
+					player!.Print(Localizer["wp_info_agent"]);
+				}
+
 			if (Config.Additional.KnifeEnabled)
 				if (!string.IsNullOrEmpty(Localizer["wp_info_knife"]))
 				{

Events.cs

@@ -1,8 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 
 namespace WeaponPaints
 {
@@ -104,9 +102,7 @@ namespace WeaponPaints
 		private void GivePlayerWeaponSkin(CCSPlayerController player, CBasePlayerWeapon weapon)
 		{
 			if (!Config.Additional.SkinEnabled) return;
-
 			if (player is null || weapon is null || !weapon.IsValid || !Utility.IsPlayerValid(player)) return;
-
 			if (!gPlayerWeaponsInfo.ContainsKey(player.Slot)) return;
 
 			bool isKnife = weapon.DesignerName.Contains("knife") || weapon.DesignerName.Contains("bayonet");
@@ -243,6 +239,7 @@ namespace WeaponPaints
 			return HookResult.Continue;
 		}
 
+		/*
 		public HookResult OnGiveNamedItemPost(DynamicHook hook)
 		{
 			var itemServices = hook.GetParam<CCSPlayer_ItemServices>(0);
@@ -256,8 +253,9 @@ namespace WeaponPaints
 
 			return HookResult.Continue;
 		}
+		*/
 
-		public void OnEntitySpawned(CEntityInstance entity)
+		public void OnEntityCreated(CEntityInstance entity)
 		{
 			var designerName = entity.DesignerName;
 
@@ -268,8 +266,8 @@ namespace WeaponPaints
 					var weapon = new CBasePlayerWeapon(entity.Handle);
 					if (weapon == null || !weapon.IsValid || weapon.OwnerEntity.Value == null) return;
 
-					CCSPlayerController? player = Utilities.GetPlayerFromIndex((int)weapon.OwnerEntity.Value.Index);
+					CCSPlayerController? player = Utilities.GetPlayerFromSteamId(weapon.OriginalOwnerXuidLow);
-					if (player == null || !player.IsValid || !Utility.IsPlayerValid(player)) return;
+					if (player is null || !player.IsValid || !Utility.IsPlayerValid(player)) return;
 
 					GivePlayerWeaponSkin(player, weapon);
 				});
@@ -299,9 +297,9 @@ namespace WeaponPaints
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
-			RegisterListener<Listeners.OnEntitySpawned>(OnEntitySpawned);
+			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
 			RegisterListener<Listeners.OnTick>(OnTick);
-			VirtualFunctions.GiveNamedItemFunc.Hook(OnGiveNamedItemPost, HookMode.Post);
+			//VirtualFunctions.GiveNamedItemFunc.Hook(OnGiveNamedItemPost, HookMode.Post);
 		}
 	}
 }

Utility.cs

@@ -44,24 +44,24 @@ namespace WeaponPaints
 					string[] createTableQueries = new[]
 					{
 				@"CREATE TABLE IF NOT EXISTS `wp_player_skins` (
-                        `steamid` varchar(64) NOT NULL,
+                        `steamid` varchar(18) NOT NULL,
                         `weapon_defindex` int(6) NOT NULL,
                         `weapon_paint_id` int(6) NOT NULL,
                         `weapon_wear` float NOT NULL DEFAULT 0.000001,
                         `weapon_seed` int(16) NOT NULL DEFAULT 0
                     ) ENGINE=InnoDB",
 				@"CREATE TABLE IF NOT EXISTS `wp_player_knife` (
-                        `steamid` varchar(64) NOT NULL,
+                        `steamid` varchar(18) NOT NULL,
                         `knife` varchar(64) NOT NULL,
                         UNIQUE (`steamid`)
                     ) ENGINE = InnoDB",
 				@"CREATE TABLE IF NOT EXISTS `wp_player_gloves` (
-					 `steamid` varchar(64) NOT NULL,
+					 `steamid` varchar(18) NOT NULL,
 					 `weapon_defindex` int(11) NOT NULL,
                       UNIQUE (`steamid`)
 					) ENGINE=InnoDB",
 				@"CREATE TABLE `wp_player_agents` (
-					 `steamid` varchar(64) NOT NULL,
+					 `steamid` varchar(18) NOT NULL,
 					 `agent_ct` varchar(64) DEFAULT NULL,
 					 `agent_t` varchar(64) DEFAULT NULL,
 					 UNIQUE KEY `steamid` (`steamid`)
@@ -89,10 +89,9 @@ namespace WeaponPaints
 
 		internal static bool IsPlayerValid(CCSPlayerController? player)
 		{
-			if (player is null) return false;
+			if (player is null || WeaponPaints.weaponSync is null) return false;
 
-			return (player is not null && player.IsValid && !player.IsBot && !player.IsHLTV && player.UserId.HasValue
+			return (player.IsValid && !player.IsBot && !player.IsHLTV && player.UserId.HasValue);
-				&& WeaponPaints.weaponSync != null && player.Connected == PlayerConnectedState.PlayerConnected && player.SteamID.ToString().Length == 17);
 		}
 
 		internal static void LoadSkinsFromFile(string filePath)

VERSION

@@ -1 +1 @@
-2.2b
+2.2d

WeaponAction.cs

@@ -305,7 +305,7 @@ namespace WeaponPaints
 				Server.NextFrame(() =>
 				{
 					string? model = player.TeamNum == 3 ? g_playersAgent[player.Slot].CT : g_playersAgent[player.Slot].T;
-					if (model == null) return;
+					if (string.IsNullOrEmpty(model)) return;
 
 					player.PlayerPawn.Value!.SetModel(
 						$"characters/models/{model}.vmdl"

WeaponPaints.cs

@@ -10,7 +10,7 @@ using System.Collections.Concurrent;
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(178)]
+[MinimumApiVersion(191)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static WeaponPaints Instance { get; private set; } = new();
@@ -158,7 +158,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.2b";
+	public override string ModuleVersion => "2.2d";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -175,13 +175,15 @@ 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.PawnIsAlive || player.IsBot ||
+				if (weaponSync == null || player is null || !player.IsValid || player.SteamID.ToString().Length != 17 || player.IsBot ||
 					player.IsHLTV || player.Connected != PlayerConnectedState.PlayerConnected)
 					continue;
 
 				g_knifePickupCount[player.Slot] = 0;
 				gPlayerWeaponsInfo.TryRemove(player.Slot, out _);
 				g_playersKnife.TryRemove(player.Slot, out _);
+				g_playersGlove.TryRemove(player.Slot, out _);
+				g_playersAgent.TryRemove(player.Slot, out _);
 
 				PlayerInfo playerInfo = new PlayerInfo
 				{

WeaponPaints.csproj

@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.179" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.193" />
-    <PackageReference Include="Dapper" Version="2.1.28" />
+    <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="MySqlConnector" Version="2.3.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>

WeaponSynchronization.cs

@@ -96,14 +96,17 @@ namespace WeaponPaints
 				if (!_config.Additional.SkinEnabled || player == null || string.IsNullOrEmpty(player.SteamId))
 					return;
 
+				var weaponInfos = new ConcurrentDictionary<int, WeaponInfo>();
+
 				await using var connection = await _database.GetConnectionAsync();
 				string query = "SELECT * FROM `wp_player_skins` WHERE `steamid` = @steamid";
 				var playerSkins = await connection.QueryAsync<dynamic>(query, new { steamid = player.SteamId });
 
 				if (playerSkins == null)
+				{
+					WeaponPaints.gPlayerWeaponsInfo[player.Slot] = weaponInfos;
 					return;
-
+				}
-				var weaponInfos = new ConcurrentDictionary<int, WeaponInfo>();
 
 				foreach (var row in playerSkins)
 				{

lang/en.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "Type {lime}!wp{default} to synchronize chosen skins",
 	"wp_info_knife": "Type {lime}!knife{default} to open knife menu",
 	"wp_info_glove": "Type {lime}!gloves{default} to open gloves menu",
+	"wp_info_agent": "Type {lime}!agents{default} to open agents menu",
 	"wp_command_cooldown": "{lightred}You can't refresh weapon paints right now",
 	"wp_command_refresh_done": "{lime}Refreshing weapon paints",
 	"wp_knife_menu_select": "You have chosen {lime}{0}{default} as your knife",

lang/lv.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "Ievadiet {lime}!wp{default}, lai sinhronizētu izvēlētās ādas",
 	"wp_info_knife": "Ievadiet {lime}!knife{default}, lai atvērtu nazis izvēlni",
 	"wp_info_glove": "Ievadiet {lime}!gloves{default}, lai atvērtu cimdi izvēlni",
+	"wp_info_agent": "Ierakstiet {lime}!agents{default}, lai atvērtu aģentu izvēlni",
 	"wp_command_cooldown": "{lightred}Šobrīd jūs nevarat atjaunot ieroču ādas",
 	"wp_command_refresh_done": "{lime}Atjauno ieroču ādas",
 	"wp_knife_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu nazi",

lang/pl.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "Wpisz {lime}!wp{default}, aby zsynchronizować wybrane skórki",
 	"wp_info_knife": "Wpisz {lime}!knife{default}, aby otworzyć menu noży",
 	"wp_info_glove": "Wpisz {lime}!gloves{default}, aby otworzyć menu rękawiczek",
+	"wp_info_agent": "Wpisz {lime}!agents{default}, aby otworzyć menu agentów",
 	"wp_command_cooldown": "{lightred}Nie możesz teraz odświeżyć skórek broni",
 	"wp_command_refresh_done": "{lime}Odświeżanie skórek broni",
 	"wp_knife_menu_select": "Wybrałeś {lime}{0}{default} jako swój nóż",

lang/pt-BR.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "Digite {lime}!wp{default} para sincronizar as skins selecionadas",
 	"wp_info_knife": "Digite {lime}!knife{default} para abrir o menu de facas",
 	"wp_info_glove": "Digite {lime}!gloves{default} para abrir o menu de luvas",
+	"wp_info_agent": "Digite {lime}!agents{default} para abrir o menu de agentes",
 	"wp_command_cooldown": "{lightred}Você não pode atualizar as skins de arma agora",
 	"wp_command_refresh_done": "{lime}Atualizando as skins de arma",
 	"wp_knife_menu_select": "Você escolheu {lime}{0}{default} como sua faca",

lang/pt-PT.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "Digite {lime}!wp{default} para sincronizar as skins selecionadas",
 	"wp_info_knife": "Digite {lime}!knife{default} para abrir o menu de facas",
 	"wp_info_glove": "Digite {lime}!gloves{default} para abrir o menu de luvas",
+	"wp_info_agent": "Digite {lime}!agents{default} para abrir o menu de agentes",
 	"wp_command_cooldown": "{lightred}Você não pode atualizar as skins de arma agora",
 	"wp_command_refresh_done": "{lime}Atualizando as skins de arma",
 	"wp_knife_menu_select": "Você escolheu {lime}{0}{default} como sua faca",

lang/ru.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "Введите {lime}!wp{default}, чтобы синхронизировать выбранные скины",
 	"wp_info_knife": "Введите {lime}!knife{default}, чтобы открыть меню ножей",
 	"wp_info_glove": "Введите {lime}!gloves{default}, чтобы открыть меню перчаток",
+	"wp_info_agent": "Введите {lime}!agents{default}, чтобы открыть меню агентов",
 	"wp_command_cooldown": "{lightred}Вы не можете обновить скины оружия сейчас",
 	"wp_command_refresh_done": "{lime}Обновление скинов оружия",
 	"wp_knife_menu_select": "Вы выбрали {lime}{0}{default} в качестве вашего ножа",

lang/tr.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "Senkronize edilen skinleri görmek için {lime}!wp{default} yazın",
 	"wp_info_knife": "Bıçak menüsünü açmak için {lime}!knife{default} yazın",
 	"wp_info_glove": "Eldiven menüsünü açmak için {lime}!gloves{default} yazın",
+	"wp_info_agent": "Ajanlar menüsünü açmak için {lime}!agents{default} yazın",
 	"wp_command_cooldown": "{lightred}Şu anda silah skinlerini yenileyemezsiniz",
 	"wp_command_refresh_done": "{lime}Silah skinleri yenileniyor",
 	"wp_knife_menu_select": "{lime}{0}{default} olarak bıçağınızı seçtiniz",

lang/ua.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "Введіть {lime}!wp{default}, щоб синхронізувати обрані шкури",
 	"wp_info_knife": "Введіть {lime}!knife{default}, щоб відкрити меню ножів",
 	"wp_info_glove": "Введіть {lime}!gloves{default}, щоб відкрити меню рукавичок",
+	"wp_info_agent": "Введіть {lime}!агенти{default}, щоб відкрити меню агентів",
 	"wp_command_cooldown": "{lightred}Наразі ви не можете оновлювати шкіри зброї",
 	"wp_command_refresh_done": "{lime}Оновлення шкірок зброї",
 	"wp_knife_menu_select": "Ви вибрали {lime}{0}{default} як ваш ніж",

lang/zh-cn.json

@@ -4,6 +4,7 @@
 	"wp_info_refresh": "输入 {lime}!wp{default} 同步已选择的皮肤",
 	"wp_info_knife": "输入 {lime}!knife{default} 打开刀具菜单",
 	"wp_info_glove": "输入 {lime}!gloves{default} 打开手套菜单",
+	"wp_info_agent": "键入 {lime}!agents{default} 打开代理菜单",
 	"wp_command_cooldown": "{lightred}您现在无法刷新武器皮肤",
 	"wp_command_refresh_done": "{lime}刷新武器皮肤",
 	"wp_knife_menu_select": "您已选择 {lime}{0}{default} 作为您的刀具",