Merge pull request #241 from daffyyyy/main

2.4d
Nereziel · Apr 26, 2024 · 74ec584 · 74ec584
2 parents c594cd5 + ec0d4f4
commit 74ec584
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/Events.cs b/Events.cs
@@ -4,6 +4,7 @@
 using CounterStrikeSharp.API.Modules.Entities;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
+using System.Runtime.InteropServices;
 
 namespace WeaponPaints
 {
@@ -342,7 +343,8 @@ private void RegisterListeners()
 			if (Config.Additional.ShowSkinImage)
 				RegisterListener<Listeners.OnTick>(OnTick);
 
-			VirtualFunctions.GiveNamedItemFunc.Hook(OnGiveNamedItemPost, HookMode.Post);
+			if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+				VirtualFunctions.GiveNamedItemFunc.Hook(OnGiveNamedItemPost, HookMode.Post);
 		}
 	}
 }
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.4b
+2.4d
diff --git a/WeaponAction.cs b/WeaponAction.cs
@@ -65,7 +65,7 @@ internal void RefreshWeapons(CCSPlayerController? player)
 
 			int playerTeam = player.TeamNum;
 
-			Dictionary<string, List<(int, int)>> weaponsWithAmmo = new Dictionary<string, List<(int, int)>>();
+			Dictionary<string, List<(int, int)>> weaponsWithAmmo = [];
 
 			foreach (var weapon in weapons)
 			{
@@ -101,7 +101,7 @@ internal void RefreshWeapons(CCSPlayerController? player)
 
 						if (!weaponsWithAmmo.TryGetValue(weaponByDefindex, out List<(int, int)>? value))
 						{
-							value = new List<(int, int)>();
+							value = [];
 							weaponsWithAmmo.Add(weaponByDefindex, value);
 						}
 
@@ -121,8 +121,8 @@ internal void RefreshWeapons(CCSPlayerController? player)
 
 			try
 			{
-				player.ExecuteClientCommand("slot 3");
-				player.ExecuteClientCommand("slot 3");
+				player.ExecuteClientCommandFromServer("slot 3");
+				player.ExecuteClientCommandFromServer("slot 3");
 
 				var weapon = player.PlayerPawn.Value.WeaponServices.ActiveWeapon;
 				if (weapon is null || !weapon.IsValid || weapon.Value == null) return;

diff --git a/WeaponPaints.cs b/WeaponPaints.cs
@@ -10,7 +10,7 @@
 
 namespace WeaponPaints;
 
-[MinimumApiVersion(201)]
+[MinimumApiVersion(215)]
 public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 {
 	internal static WeaponPaints Instance { get; private set; } = new();
@@ -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.4b";
+	public override string ModuleVersion => "2.4d";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -252,7 +252,8 @@ public void OnConfigParsed(WeaponPaintsConfig config)
 		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!");
+			Unload(false);
+			//throw new Exception("[WeaponPaints] You need to setup Database credentials in config!");
 		}
 
 		var builder = new MySqlConnectionStringBuilder

diff --git a/WeaponPaints.csproj b/WeaponPaints.csproj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.203" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.215" />
     <PackageReference Include="Dapper" Version="2.1.35" />
-    <PackageReference Include="MySqlConnector" Version="2.3.6" />
+    <PackageReference Include="MySqlConnector" Version="2.3.7" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>