Merge pull request #129 from daffyyyy/main

1.4c

Commands.cs

@@ -10,7 +10,9 @@ namespace WeaponPaints
 		{
 			if (!Config.Additional.CommandWpEnabled || !Config.Additional.SkinEnabled || !g_bCommandsAllowed) return;
 			if (!Utility.IsPlayerValid(player)) return;
-			if (player == null || player.Index <= 0) return;
+
+			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
+
 			int playerIndex = (int)player!.Index;
 
 			PlayerInfo playerInfo = new PlayerInfo
@@ -22,31 +24,35 @@ namespace WeaponPaints
 				IpAddress = player?.IpAddress?.Split(":")[0]
 			};
 
-			if (player == null || player.UserId == null) return;
+			if (player == null || !player.IsValid || player.UserId == null || player.IsBot) return;
 
-			if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
-				DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
+			try
 			{
-				commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
-				if (weaponSync != null)
-					Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
-				if (Config.Additional.KnifeEnabled)
+				if (!commandsCooldown.TryGetValue((int)player.UserId, out DateTime cooldownEndTime) ||
+	DateTime.UtcNow >= (commandsCooldown.TryGetValue((int)player.UserId, out cooldownEndTime) ? cooldownEndTime : DateTime.UtcNow))
 				{
+					commandsCooldown[(int)player.UserId] = DateTime.UtcNow.AddSeconds(Config.CmdRefreshCooldownSeconds);
 					if (weaponSync != null)
-						Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
+						Task.Run(async () => await weaponSync.GetWeaponPaintsFromDatabase(playerInfo));
+					if (Config.Additional.KnifeEnabled)
+					{
+						if (weaponSync != null)
+							Task.Run(async () => await weaponSync.GetKnifeFromDatabase(playerInfo));
 
-					RefreshWeapons(player);
+						RefreshWeapons(player);
+					}
+					if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
+					{
+						player!.Print(Localizer["wp_command_refresh_done"]);
+					}
+					return;
 				}
-				if (!string.IsNullOrEmpty(Localizer["wp_command_refresh_done"]))
+				if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
 				{
-					player!.Print(Localizer["wp_command_refresh_done"]);
+					player!.Print(Localizer["wp_command_cooldown"]);
 				}
-				return;
-			}
-			if (!string.IsNullOrEmpty(Localizer["wp_command_cooldown"]))
-			{
-				player!.Print(Localizer["wp_command_cooldown"]);
 			}
+			catch (Exception) { }
 		}
 
 		private void OnCommandWS(CCSPlayerController? player, CommandInfo command)

Events.cs

@@ -9,25 +9,27 @@ namespace WeaponPaints
 		{
 			CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
 
+			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null || player.Connected == PlayerConnectedState.PlayerDisconnecting) return;
+
 			PlayerInfo playerInfo = new PlayerInfo
 			{
 				UserId = player.UserId,
 				Index = (int)player.Index,
 				SteamId = player.SteamID.ToString(),
-				Name = player?.PlayerName,
-				IpAddress = player?.IpAddress?.Split(":")[0]
+				Name = player.PlayerName,
+				IpAddress = player.IpAddress?.Split(":")[0]
 			};
 
-			if (player == null || !player.IsValid || player.IsBot || player.IsHLTV || weaponSync == null) return;
-
-			Task.Run(async () =>
+			if (!gPlayerWeaponsInfo.ContainsKey((int)player.Index))
 			{
-				if (Config.Additional.SkinEnabled)
-					await weaponSync.GetKnifeFromDatabase(playerInfo);
-			});
-
-			//if (Config.Additional.KnifeEnabled && weaponSync != null)
-			//_ = weaponSync.GetKnifeFromDatabase(playerIndex);
+				Task.Run(async () =>
+				{
+					if (Config.Additional.SkinEnabled)
+						await weaponSync.GetWeaponPaintsFromDatabase(playerInfo);
+					if (Config.Additional.KnifeEnabled)
+						await weaponSync.GetKnifeFromDatabase(playerInfo);
+				});
+			}
 		}
 
 		private void OnClientDisconnect(int playerSlot)
@@ -175,6 +177,7 @@ namespace WeaponPaints
 				weaponSync = new WeaponSynchronization(DatabaseConnectionString, Config, GlobalShareApi, GlobalShareServerId);
 			});
 
+			/*
 			g_hTimerCheckSkinsData = AddTimer(10.0f, () =>
 			{
 				List<CCSPlayerController> players = Utilities.GetPlayers();
@@ -199,6 +202,7 @@ namespace WeaponPaints
 						_ = weaponSync.GetKnifeFromDatabase(playerInfo);
 				}
 			}, CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE | CounterStrikeSharp.API.Modules.Timers.TimerFlags.REPEAT);
+			*/
 		}
 
 		private HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventInfo info)
@@ -279,7 +283,7 @@ namespace WeaponPaints
 			{
 				try
 				{
-					if (player == null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV) continue;
+					if (player == null || !player.IsValid || !player.PawnIsAlive || player.IsBot || player.IsHLTV || player.Connected == PlayerConnectedState.PlayerDisconnecting) continue;
 
 					var viewModels = GetPlayerViewModels(player);
 
@@ -320,11 +324,11 @@ namespace WeaponPaints
 			RegisterListener<Listeners.OnMapStart>(OnMapStart);
 			RegisterListener<Listeners.OnTick>(OnTick);
 
-			RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
+			//RegisterEventHandler<EventPlayerConnectFull>(OnPlayerConnectFull);
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart, HookMode.Pre);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
-			RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
+			//RegisterEventHandler<EventItemPurchase>(OnEventItemPurchasePost);
 			//RegisterEventHandler<EventItemPickup>(OnItemPickup);
 			HookEntityOutput("weapon_knife", "OnPlayerPickup", OnPickup, HookMode.Pre);
 		}

README.md

@@ -23,7 +23,8 @@ Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin
 ## CS2 Server
 - Have working CounterStrikeSharp (**with RUNTIME!**)
 - Download from Release and copy plugin to plugins
-- Setup `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
+- Run server with plugin, **it will generate config if installed correctly!**
+- Edit `addons/counterstrikesharp/configs/`**`plugins/WeaponPaints/WeaponPaints.json`** set **`GlobalShare`** to **`true`** for global, or include database credentials
 - In `addons/counterstrikesharp/configs/`**`core.json`** set **FollowCS2ServerGuidelines** to **`false`**
 
 ## Plugin Configuration

VERSION

@@ -1 +1 @@
-1.4b
+1.4c

WeaponPaints.cs

@@ -83,7 +83,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	internal int GlobalShareServerId = 0;
 	internal static Dictionary<int, DateTime> commandsCooldown = new Dictionary<int, DateTime>();
 	private string DatabaseConnectionString = string.Empty;
-	private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
+	//private CounterStrikeSharp.API.Modules.Timers.Timer? g_hTimerCheckSkinsData = null;
 	public static Dictionary<int, string> weaponDefindex { get; } = new Dictionary<int, string>
 	{
 		{ 1, "weapon_deagle" },
@@ -145,7 +145,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 	public override string ModuleAuthor => "Nereziel & daffyy";
 	public override string ModuleDescription => "Skin and knife selector, standalone and web-based";
 	public override string ModuleName => "WeaponPaints";
-	public override string ModuleVersion => "1.4b";
+	public override string ModuleVersion => "1.4c";
 
 	public static WeaponPaintsConfig GetWeaponPaintsConfig()
 	{
@@ -187,10 +187,6 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 
 				g_knifePickupCount[(int)player!.Index] = 0;
 			}
-			/*
-			RegisterListeners();
-			RegisterCommands();
-			*/
 		}
 
 		if (Config.Additional.KnifeEnabled)
@@ -253,7 +249,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
 				Task<string> responseBodyTask = response.Content.ReadAsStringAsync();
 				responseBodyTask.Wait();
 				string responseBody = responseBodyTask.Result;
-				GlobalShareServerId = Int32.Parse(responseBody);
+				GlobalShareServerId = int.Parse(responseBody);
 			}
 			else
 			{