Merge a8f813b4db into 1ef12ed6b2

Events.cs

@@ -59,8 +59,6 @@ namespace WeaponPaints
 			catch
 			{
 			}
-			
-			Players.Add(player);
 
 			return HookResult.Continue;
 		}
@@ -116,7 +114,6 @@ namespace WeaponPaints
 			
 			_temporaryPlayerWeaponWear.TryRemove(player.Slot, out _);
 			CommandsCooldown.Remove(player.Slot);
-			Players.Remove(player);
 
 			return HookResult.Continue;
 		}
@@ -242,7 +239,7 @@ namespace WeaponPaints
 
 						if (steamid != null && steamid.IsValid())
 						{
-							player = Players.FirstOrDefault(p => p.IsValid && p.SteamID == steamid.SteamId64);
+							player = Utilities.GetPlayers().FirstOrDefault(p => p.IsValid && p.SteamID == steamid.SteamId64);
 
 							if (player == null)
 								player = Utilities.GetPlayerFromSteamId(weapon.OriginalOwnerXuidLow);
@@ -269,7 +266,11 @@ namespace WeaponPaints
 		{
 			if (!Config.Additional.ShowSkinImage) return;
 
-			foreach (var player in Players)
+			foreach (var player in Utilities.GetPlayers().Where(p =>
+							p is { IsValid: true, PlayerPawn.IsValid: true, IsBot: false } and
+								{ Connected: PlayerConnectedState.PlayerConnected }
+							)
+				)
 			{
 				if (_playerWeaponImage.TryGetValue(player.Slot, out var value) && !string.IsNullOrEmpty(value))
 				{

Variables.cs

@@ -168,6 +168,4 @@ public partial class WeaponPaints
 	private static readonly PluginCapability<IMenuApi> MenuCapability = new("menu:nfcore");
 	
 	private int _fadeSeed;
-
-	internal List<CCSPlayerController> Players = [];
 }

WeaponAction.cs

@@ -332,27 +332,13 @@ namespace WeaponPaints
 						if (!PlayerHasKnife(player) && hasKnife)
 						{
 							var newKnife = new CBasePlayerWeapon(player.GiveNamedItem(CsItem.Knife));
+							newKnife.AddEntityIOEvent("Kill", newKnife, null, "", 0.01f);
 							var newWeapon = new CBasePlayerWeapon(player.GiveNamedItem(CsItem.USP));
 							player.GiveNamedItem(CsItem.Knife);
 							player.ExecuteClientCommand("slot3");
-
-							Server.NextFrame(() =>
-							{
-								try
-								{
-									if (newKnife != null && newKnife.IsValid)
-										newKnife.AddEntityIOEvent("Kill", newKnife, null, "", 0.01f);
-									if (newWeapon != null && newWeapon.IsValid)
-										newWeapon.AddEntityIOEvent("Kill", newWeapon, null, "", 0.01f);
-								}
-								catch (Exception ex)
-								{
-									Logger.LogWarning("Error AddEntityIOEvent " + ex.Message);
-								}
-							});
+							newWeapon.AddEntityIOEvent("Kill", newWeapon, null, "", 0.01f);
 						}
 
-
 						foreach (var entry in weaponsWithAmmo)
 						{
 							foreach (var ammo in entry.Value)

WeaponPaints.csproj

@@ -9,20 +9,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.358" />
-    <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="MySqlConnector" Version="2.4.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.339" />
+    <PackageReference Include="Dapper" Version="2.1.35" />
+    <PackageReference Include="MySqlConnector" Version="2.4.0-beta.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
     <None Update="lang\**\*.*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <None Update="gamedata\*.*" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <Reference Include="MenuManagerApi">
       <HintPath>3rd_party\MenuManagerApi.dll</HintPath>

WeaponPaints.sln.DotSettings.user

@@ -1,11 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005Cxdaff_005CDocuments_005CGitHub_005Ccs2_002DWeaponPaints_005C3rd_005Fparty_005CMenuManagerApi_002Edll/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACBaseAnimGraph_002Eg_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fedce4cda20b83aa28fbed15b81eb0eda1753e497144879a4bd754947d37639_003FCBaseAnimGraph_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACBaseEntity_002Eg_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fdd25ac51dad807865e0d135626a4fd984d63a388bf0c3285f9d7d7db9c1071_003FCBaseEntity_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACBodyComponent_002Eg_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fdb7e149cad83cf211ee55349a3442256ec62acce5ba41474ad124572f767e271_003FCBodyComponent_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACCSPlayerController_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fab13f7aee75d35b3ec314a3fd92a24c4c0126cef65a8dda49bd83da5a2a77443_003FCCSPlayerController_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACCSPlayerController_005FInventoryServices_002Eg_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fff255772feb17b2ef53224c45249eee339ad7148e2b42bb1afad71bd57d02b69_003FCCSPlayerController_005FInventoryServices_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACGameSceneNode_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F343a4f176a269193769d7fd81231808c83529cab0f6c98fd96eb77f558974_003FCGameSceneNode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACModelState_002Eg_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fb03ffa24c03867c84b5d095397bd1578b8ea563ab2c72b30242ffad815d49e_003FCModelState_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AListeners_002Eg_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fdbb2ccedd8f0b227a69f9ef0b434aa5a70b83e93bf1eac4cd91a31b7985efd4_003FListeners_002Eg_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANetworkedVector_002Ecs_002Fl_003AC_0021_003FUsers_003Fxdaff_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fd68dbf9c04bc6046e155f1866c3615a47e34017f330c9e351d68979b9281c_003FNetworkedVector_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

lang/lv.json

@@ -1,30 +1,30 @@
 {
 	"wp_prefix": "{lightblue}[WeaponPaints] {default}",
-	"wp_info_website": "Apmeklē {lime}{0}{default}, kur varat mainīt ādas",
-	"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": "Ievadiet {lime}!agents{default}, lai atvērtu aģentu izvēlni",
-	"wp_info_music": "Ievadiet {lime}!music{default}, lai atvērtu mūzikas izvēlni",
-	"wp_info_pin": "Ierakstiet {lime}!pins{default}, lai atvērtu piespraudes izvēlni",
-	"wp_command_cooldown": "{lightred}Šobrīd nevarat atsvaidzināt ieroča krāsas",
-	"wp_command_refresh_done": "{lime}Atsvaidzinot ieroča krāsas",
-	"wp_knife_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu nazi",
+	"wp_info_website": "Apmeklē {lime}{0}{default}, kur vari mainīt skinus",
+	"wp_info_refresh": "Ieraksti {lime}!wp{default}, lai sinhronizētu izvēlētos skinus",
+	"wp_info_knife": "Ieraksti {lime}!knife{default}, lai atvērtu nažu izvēlni",
+	"wp_info_glove": "Ieraksti {lime}!gloves{default}, lai atvērtu cimdu izvēlni",
+	"wp_info_agent": "Ieraksti {lime}!agents{default}, lai atvērtu aģentu izvēlni",
+	"wp_info_music": "Ieraksti {lime}!music{default}, lai atvērtu mūzikas izvēlni",
+	"wp_info_pin": "Ieraksti {lime}!pins{default}, lai atvērtu nozīmīšu izvēlni",
+	"wp_command_cooldown": "{lightred}Šobrīd nevar atjaunot weapon paints",
+	"wp_command_refresh_done": "{lime}Weapon paints tiek atjaunoti",
+	"wp_knife_menu_select": "Tu izvēlējies {lime}{0}{default} kā savu nazi",
 	"wp_knife_menu_kill": "",
-	"wp_knife_menu_title": "Nazi Izvēlne",
-	"wp_glove_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu cimdu",
-	"wp_glove_menu_title": "Cimdu Izvēlne",
-	"wp_agent_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu aģentu",
-	"wp_agent_menu_title": "Aģentu Izvēlne",
-	"wp_music_menu_title": "Mūzikas Izvēlne",
-	"wp_music_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu mūzikas komplektu",
-	"wp_pins_menu_title": "Piespraužu izvēlne",
-	"wp_pins_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu piespraudi",
-	"wp_skin_menu_weapon_title": "Ieroču Izvēlne",
-	"wp_skin_menu_skin_title": "Izvēlieties ādu priekš {lime}{0}{default}",
-	"wp_skin_menu_select": "Jūs esat izvēlējies {lime}{0}{default} kā savu ādu",
-	
-	"wp_stattrak_action": "Jūs veiksmīgi mainījāt stattrak iestatījumu",
+	"wp_knife_menu_title": "Nažu izvēlne",
+	"wp_glove_menu_select": "Tu izvēlējies {lime}{0}{default} kā savus cimdus",
+	"wp_glove_menu_title": "Cimdu izvēlne",
+	"wp_agent_menu_select": "Tu izvēlējies {lime}{0}{default} kā savu aģentu",
+	"wp_agent_menu_title": "Aģentu izvēlne",
+	"wp_music_menu_title": "Mūzikas izvēlne",
+	"wp_music_menu_select": "Tu izvēlējies {lime}{0}{default} kā savu mūzikas komplektu",
+	"wp_pins_menu_title": "Nozīmīšu izvēlne",
+	"wp_pins_menu_select": "Tu izvēlējies {lime}{0}{default} kā savu nozīmīti",
+	"wp_skin_menu_weapon_title": "Ieroču izvēlne",
+	"wp_skin_menu_skin_title": "Izvēlies skinu priekš {lime}{0}{default}",
+	"wp_skin_menu_select": "Tu izvēlējies {lime}{0}{default} kā savu skinu",
+
+	"wp_stattrak_action": "Tu veiksmīgi nomainīji stattrak iestatījumu",
 	
 	"None": "Nav"
-}
+}