Patch V4.1.5

Author: K4ryuu

CHANGELOG

@@ -1,3 +1,9 @@
+-- 2023.04.16 - V4.1.5
+
+- fix: Scoreboard rank missmatch of flag based ones
+- fix: LVLRanks MySQL SteamIDs
+- fix: Death stats not counted properly
+
 -- 2023.04.14 - V4.1.4
 
 - fix: MySQL error logging non-thread problems

K4-System/src/Module/Rank/RankCommands.cs

@@ -176,16 +176,29 @@ public void OnCommandTop(CCSPlayerController? player, CommandInfo info)
 				printCount = Math.Clamp(parsedInt, 1, 25);
 			}
 
+			Logger.LogInformation($"Player {k4player.PlayerName} requested top {printCount} players.");
+
 			Task.Run(async () =>
 			{
+				Console.WriteLine("Saving all players data");
+
 				await plugin.SaveAllPlayersDataAsync();
+
+				Console.WriteLine("Fetching top data");
+
 				List<(int points, string name)>? rankData = await FetchTopDataAsync(printCount);
 
+				Console.WriteLine("Fetched top data, waiting tick to print to chat.");
+
 				Server.NextFrame(() =>
 				{
+					Console.WriteLine("Printing top data to chat.");
+
 					if (!k4player.IsValid || !k4player.IsPlayer)
 						return;
 
+					Console.WriteLine("Player is valid and is player.");
+
 					if (rankData?.Count > 0)
 					{
 						for (int i = 0; i < rankData.Count; i++)
@@ -195,12 +208,12 @@ public void OnCommandTop(CCSPlayerController? player, CommandInfo info)
 
 							Rank rank = GetPlayerRank(points);
 
-							k4player.Controller.PrintToChat($" {plugin.Localizer["k4.ranks.top.line", i + 1, rank.Color, rank.Name, name, points]}");
+							player!.PrintToChat($" {plugin.Localizer["k4.ranks.top.line", i + 1, rank.Color, rank.Name, name, points]}");
 						}
 					}
 					else
 					{
-						k4player.Controller.PrintToChat($" {plugin.Localizer["k4.general.prefix"]} {plugin.Localizer["k4.ranks.top.notfound", printCount]}");
+						player!.PrintToChat($" {plugin.Localizer["k4.general.prefix"]} {plugin.Localizer["k4.ranks.top.notfound", printCount]}");
 					}
 				});
 			});
@@ -223,7 +236,7 @@ public void OnCommandTop(CCSPlayerController? player, CommandInfo info)
 			}
 			catch (Exception ex)
 			{
-				Logger.LogError($"A problem occurred while fetching top data: {ex.Message}");
+				Server.NextFrame(() => { Logger.LogError($"A problem occurred while fetching top data: {ex.Message}"); });
 				return null;
 			}
 		}

K4-System/src/Module/Rank/RankFunctions.cs

@@ -211,7 +211,7 @@ public void ModifyPlayerPoints(K4Player k4player, int amount, string reason, str
             }
             catch (Exception ex)
             {
-                Logger.LogError($"A problem occurred while fetching player place and count: {ex.Message}");
+                Server.NextFrame(() => Logger.LogError($"A problem occurred while fetching player place and count: {ex.Message}"));
             }
 
             return (0, 0);
@@ -255,20 +255,10 @@ public void SetPlayerClanTag(K4Player k4player)
                     if (adminSettings.ClanTag == null)
                         continue;
 
-                    switch (adminSettings.Permission[0])
+                    if (Plugin.PlayerHasPermission(k4player, adminSettings.Permission))
                     {
-                        case '@':
-                            if (AdminManager.PlayerHasPermissions(k4player.Controller, adminSettings.Permission))
-                                tag = adminSettings.ClanTag;
-                            break;
-                        case '#':
-                            if (AdminManager.PlayerInGroup(k4player.Controller, adminSettings.Permission))
-                                tag = adminSettings.ClanTag;
-                            break;
-                        default:
-                            if (AdminManager.PlayerHasCommandOverride(k4player.Controller, adminSettings.Permission))
-                                tag = adminSettings.ClanTag;
-                            break;
+                        tag = adminSettings.ClanTag;
+                        break;
                     }
                 }
             }

K4-System/src/Module/Stat/StatEvents.cs

@@ -23,7 +23,7 @@ public void Initialize_Events()
 				if (!k4victim.IsPlayer && !Config.StatisticSettings.StatsForBots)
 					return HookResult.Continue;
 
-				if (!k4victim.IsPlayer)
+				if (k4victim.IsPlayer)
 				{
 					ModifyPlayerStats(k4victim, "deaths", 1);
 				}

K4-System/src/Module/Utils/UtilsCommands.cs

@@ -36,7 +36,7 @@ public void OnCommandAdmins(CCSPlayerController? player, CommandInfo info)
 					if (entry.ListColor == null)
 						continue;
 
-					if (PlayerHasPermission(k4player, entry.Permission))
+					if (Plugin.PlayerHasPermission(k4player, entry.Permission))
 					{
 						adminList.Add($"{plugin.ApplyPrefixColors(entry.ListColor ?? "default")}{k4player.PlayerName}");
 						break;
@@ -53,19 +53,6 @@ public void OnCommandAdmins(CCSPlayerController? player, CommandInfo info)
 			}
 			else
 				info.ReplyToCommand($" {plugin.Localizer["k4.adminlist.no-admins"]}");
-
-			bool PlayerHasPermission(K4Player k4player, string permission)
-			{
-				switch (permission[0])
-				{
-					case '@':
-						return AdminManager.PlayerHasPermissions(k4player.Controller, permission);
-					case '#':
-						return AdminManager.PlayerInGroup(k4player.Controller, permission);
-					default:
-						return AdminManager.PlayerHasCommandOverride(k4player.Controller, permission);
-				}
-			}
 		}
 	}
 }

K4-System/src/Plugin/PluginDatabase.cs

@@ -3,6 +3,7 @@
 using System.Text;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Entities;
 using Dapper;
 using K4System.Models;
 using Microsoft.Extensions.Logging;
@@ -170,7 +171,7 @@ ON DUPLICATE KEY UPDATE
 
 		var parameters = new
 		{
-			SteamId = k4player.SteamID.ToString().Replace("STEAM_0", "STEAM_1"),
+			SteamId = new SteamID(k4player.SteamID).SteamId2.Replace("STEAM_0", "STEAM_1"),
 			k4player.PlayerName,
 			Kills = k4player.statData?.StatFields["kills"] ?? 0,
 			Deaths = k4player.statData?.StatFields["deaths"] ?? 0,

K4-System/src/Plugin/PluginManifest.cs

@@ -10,7 +10,7 @@ public sealed partial class Plugin : BasePlugin
 
         public override string ModuleAuthor => "K4ryuu";
 
-        public override string ModuleVersion => "4.1.4 " +
+        public override string ModuleVersion => "4.1.5 " +
 #if RELEASE
             "(release)";
 #else

K4-System/src/Plugin/PluginStock.cs

@@ -81,5 +81,18 @@ public bool CommandHelper(CCSPlayerController? player, CommandInfo info, Command
 		{
 			return K4Players.FirstOrDefault(player => player.Controller == playerController);
 		}
+
+		public static bool PlayerHasPermission(K4Player k4player, string permission)
+		{
+			switch (permission[0])
+			{
+				case '@':
+					return AdminManager.PlayerHasPermissions(k4player.Controller, permission);
+				case '#':
+					return AdminManager.PlayerInGroup(k4player.Controller, permission);
+				default:
+					return AdminManager.PlayerHasCommandOverride(k4player.Controller, permission);
+			}
+		}
 	}
 }