Update 1.DZ.8.4

Changed Targeting

Author: darkerz7

EntWatchSharp/Commands.cs

@@ -1,14 +1,13 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Admin;
 using CounterStrikeSharp.API.Modules.Commands;
+using CounterStrikeSharp.API.Modules.Commands.Targeting;
 using EntWatchSharp.Helpers;
 using EntWatchSharp.Items;
 using EntWatchSharp.Modules;
 using EntWatchSharp.Modules.Eban;
 using System.Globalization;
-using static EntWatchSharp.Helpers.FindTarget;
 using static EntWatchSharp.Modules.Eban.EbanDB;
 
 namespace EntWatchSharp
@@ -396,7 +395,7 @@ public void OnEWBan(CCSPlayerController? admin, CommandInfo command)
 			if (admin != null && !admin.IsValid) return;
 			bool bConsole = command.CallingContext == CommandCallingContext.Console;
 
-			(List<CCSPlayerController> players, string _) = Find(admin, command, 1, true, true, MultipleFlags.NORMAL, false);
+			(List<CCSPlayerController> players, string _, ProcessTargetResultFlag _) = EW.FindTargets(admin, command.GetArg(1), true, true, false);
 
 			OfflineBan target = null;
 
@@ -490,9 +489,9 @@ public void OnEWUnBan(CCSPlayerController? admin, CommandInfo command)
 			if (admin != null && !admin.IsValid) return;
 			bool bConsole = command.CallingContext == CommandCallingContext.Console;
 
-			(List<CCSPlayerController> players, string _) = Find(admin, command, 1, true, true, MultipleFlags.NORMAL, false);
+            (List<CCSPlayerController> players, string _, ProcessTargetResultFlag _) = EW.FindTargets(admin, command.GetArg(1), true, true, false);
 
-			EbanPlayer target = new();
+            EbanPlayer target = new();
 			string sTarget = command.GetArg(1);
 
 			bool bOnline = players.Count > 0;
@@ -605,9 +604,13 @@ public void OnEWStatus(CCSPlayerController? player, CommandInfo command)
 			CCSPlayerController target = player;
 			if (command.ArgCount > 1)
 			{
-				(List<CCSPlayerController> players, string _) = Find(player, command, 1, true, false, MultipleFlags.NORMAL);
+                (List<CCSPlayerController> players, string _, ProcessTargetResultFlag _) = EW.FindTargets(player, command.GetArg(1), true, false, false);
 
-				if (players.Count == 0) return;
+				if (players.Count == 0)
+				{
+                    UI.EWReplyInfo(player, "Reply.No_matching_client", bConsole);
+                    return;
+				}
 
 				target = players.Single();
 			}
@@ -731,8 +734,12 @@ public void OnEWTransfer(CCSPlayerController? admin, CommandInfo command)
 				}
 			} else
 			{
-				(List<CCSPlayerController> players, string _) = Find(admin, command, 1, true, true, MultipleFlags.IGNORE_DEAD_PLAYERS);
-				if (players.Count == 0) return;
+                (List<CCSPlayerController> players, string _, ProcessTargetResultFlag _) = EW.FindTargets(admin, command.GetArg(1), true, true, true);
+				if (players.Count == 0)
+				{
+                    UI.EWReplyInfo(admin, "Reply.No_matching_client", bConsole);
+                    return;
+				}
 				target = players.Single();
 			}
 
@@ -742,8 +749,12 @@ public void OnEWTransfer(CCSPlayerController? admin, CommandInfo command)
 				return;
 			}
 
-			(List<CCSPlayerController> players1, string _) = Find(admin, command, 2, true, false, MultipleFlags.IGNORE_DEAD_PLAYERS);
-			if (players1.Count == 0) return;
+            (List<CCSPlayerController> players1, string _, ProcessTargetResultFlag _) = EW.FindTargets(admin, command.GetArg(2), true, true, true);
+			if (players1.Count == 0)
+			{
+                UI.EWReplyInfo(admin, "Reply.No_matching_client", bConsole);
+                return;
+			}
 			CCSPlayerController receiver = players1.Single();
 
 			if (!EW.CheckDictionary(receiver))
@@ -802,8 +813,12 @@ public void OnEWSpawn(CCSPlayerController? admin, CommandInfo command)
 				return;
 			}
 
-			(List<CCSPlayerController> players, string _) = Find(admin, command, 2, true, false, MultipleFlags.IGNORE_DEAD_PLAYERS);
-			if (players.Count == 0) return;
+            (List<CCSPlayerController> players, string _, ProcessTargetResultFlag _) = EW.FindTargets(admin, command.GetArg(1), true, true, true);
+			if (players.Count == 0)
+			{
+                UI.EWReplyInfo(admin, "Reply.No_matching_client", bConsole);
+                return;
+			}
 			CCSPlayerController receiver = players.Single();
 
 			if (!EW.CheckDictionary(receiver))

EntWatchSharp/EW.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Capabilities;
+using CounterStrikeSharp.API.Modules.Commands.Targeting;
 using CS2_GameHUDAPI;
 using EntWatchSharp.Helpers;
 using EntWatchSharp.Items;
@@ -284,7 +285,27 @@ public static bool IsGameUI(CEntityInstance entity)
 			return false;
 		}
 
-		public static string ConvertSteamID64ToSteamID(string steamId64)
+        public static (List<CCSPlayerController> players, string targetname, ProcessTargetResultFlag result) FindTargets(CCSPlayerController? player, string targetString, bool nobots, bool immunity, bool aliveonly)
+        {
+            var filter = ProcessTargetFilterFlag.None;
+
+            if (nobots)
+                filter |= ProcessTargetFilterFlag.FilterNoBots;
+
+            if (!immunity)
+                filter |= ProcessTargetFilterFlag.FilterNoImmunity;
+
+			if (aliveonly)
+				filter |= ProcessTargetFilterFlag.FilterAlive;
+
+            ProcessTargetResultFlag result;
+            if ((result = Target.ProcessTargetString(player, targetString, filter, true, out var targetname, out var players)) == ProcessTargetResultFlag.TargetFound)
+                return (players, targetname, result);
+
+            return ([], "", result);
+        }
+
+        public static string ConvertSteamID64ToSteamID(string steamId64)
 		{
 			if (ulong.TryParse(steamId64, out var communityId) && communityId > 76561197960265728)
 			{

EntWatchSharp/EntWatchSharp.cs

@@ -18,7 +18,7 @@ public partial class EntWatchSharp : BasePlugin
 		public override string ModuleName => "EntWatchSharp";
 		public override string ModuleDescription => "Notify players about entity interactions";
 		public override string ModuleAuthor => "DarkerZ [RUS]";
-		public override string ModuleVersion => "1.DZ.8.3";
+		public override string ModuleVersion => "1.DZ.8.4";
 
 		public override void OnAllPluginsLoaded(bool hotReload)
 		{

EntWatchSharp/Events.cs

@@ -174,6 +174,10 @@ private void OnMapEnd_Listener()
 				EW.g_Timer.Kill();
 				EW.g_Timer = null;
 			}
+			foreach(var offlineplayer in EW.g_OfflinePlayer.ToList())
+			{
+                offlineplayer.UserID = -1;
+            }
 		}
 
 		private void OnEntitySpawned_Listener(CEntityInstance entity)

EntWatchSharp/Helpers/FindTarget.cs

@@ -37,7 +37,7 @@ static OfflineBan CreateOrFind(CCSPlayerController UserID)
 				offlineplayer = new OfflineBan();
 				EW.g_OfflinePlayer.Add(offlineplayer);
 			}
-			offlineplayer.UserID = UserID.UserId ?? 0;
+			offlineplayer.UserID = UserID.UserId ?? -1;
 			offlineplayer.Name = UserID.PlayerName;
 			offlineplayer.SteamID = EW.ConvertSteamID64ToSteamID(UserID.SteamID.ToString());
 			offlineplayer.Immutity = AdminManager.GetPlayerImmunity(UserID);
@@ -97,6 +97,11 @@ public static OfflineBan FindTarget(CCSPlayerController admin, string sTarget, b
 					UI.EWReplyInfo(admin, "Reply.Must_be_an_integer", bConsole);
 					return null;
 				}
+				if (iUID < 0)
+				{
+                    UI.EWReplyInfo(admin, "Reply.No_matching_client", bConsole);
+                    return null;
+                }
 				foreach (OfflineBan OfflineTest in EW.g_OfflinePlayer.ToList())
 				{
 					if (!OfflineTest.Online && OfflineTest.UserID == iUID)

EntWatchSharp/Modules/Eban/OfflineBan.cs

@@ -32,8 +32,6 @@
   "Reply.No_matching_client": "There is no matching client.",
   "Reply.More_than_one_client_matched": "There are multiple clients that match.",
   "Reply.You_cannot_target": "Since this person's immunity level is higher than yours, you cannot target this person.",
-  "Reply.You_can_target_only_dead_players": "You can target only dead players.",
-  "Reply.You_can_target_only_alive_players": "You can target only alive players",
   "Reply.Must_be_an_integer": "The entered value must be a number",
   "Reply.Reload_configs": "Configs has been reloaded..",
   "Reply.NotValid": "The value you entered is not valid. Please use help",
@@ -88,14 +86,5 @@
   "Reply.Offline.OnServer": "{0}. {1}(#{2}/{3}). Last item: {4}. Status: Online",
   "Reply.Offline.Leave": "{0}. {1}(#{2}/{3}). Last item: {4}. Status: left {5} minutes ago",
   "All.Enabled": "Enabled",
-  "All.Disabled": "Disabled",
-  "all": "all players",
-  "bots": "bots",
-  "humans": "humans",
-  "alive": "alive players",
-  "dead": "dead players",
-  "notme": "all players except self",
-  "ct": "ct players",
-  "t": "t players",
-  "spec": "spec players"
+  "All.Disabled": "Disabled"
 } 

EntWatchSharp/addons/counterstrikesharp/plugins/EntWatchSharp/lang/en.json

@@ -32,8 +32,6 @@
   "Reply.No_matching_client": "Игрок не найден",
   "Reply.More_than_one_client_matched": "Найдено несколько игроков",
   "Reply.You_cannot_target": "Иммунитет этого игрока выше вашего",
-  "Reply.You_can_target_only_dead_players": "Вы можете выбрать только мёртвых игроков",
-  "Reply.You_can_target_only_alive_players": "Вы можете выбрать только живых игроков",
   "Reply.Must_be_an_integer": "Введенное значение должно быть числом",
   "Reply.Reload_configs": "Конфиги перезагружены...",
   "Reply.NotValid": "Введённое значение не валидно. Воспользуйтесь помощью",
@@ -88,14 +86,5 @@
   "Reply.Offline.OnServer": "{0}. {1}(#{2}/{3}). Последний итем: {4}. Статус: Онлайн",
   "Reply.Offline.Leave": "{0}. {1}(#{2}/{3}). Последний итем: {4}. Статус: вышел {5} минут назад",
   "All.Enabled": "Включена",
-  "All.Disabled": "Отключена",
-  "all": "все игроки",
-  "bots": "боты",
-  "humans": "игроки",
-  "alive": "живые игроки",
-  "dead": "мертвые игроки",
-  "notme": "все игроки кроме себя",
-  "ct": "контры",
-  "t": "террористы",
-  "spec": "спектаторы"
+  "All.Disabled": "Отключена"
 } 

EntWatchSharp/addons/counterstrikesharp/plugins/EntWatchSharp/lang/ru.json

@@ -32,8 +32,6 @@
   "Reply.No_matching_client": "没有匹配的客户端。",
   "Reply.More_than_one_client_matched": "有多个匹配的客户端。",
   "Reply.You_cannot_target": "由于此人的权限级别高于你，你无法针对此人。",
-  "Reply.You_can_target_only_dead_players": "你只能针对死亡的玩家。",
-  "Reply.You_can_target_only_alive_players": "你只能针对存活的玩家",
   "Reply.Must_be_an_integer": "输入的值必须是一个数字",
   "Reply.Reload_configs": "配置已重新加载。",
   "Reply.NotValid": "您输入的值无效。请使用帮助",
@@ -88,14 +86,5 @@
   "Reply.Offline.OnServer": "{0}. {1}(#{2}/{3})。最后物品：{4}。状态：在线",
   "Reply.Offline.Leave": "{0}. {1}(#{2}/{3})。最后物品：{4}。状态：{5} 分钟前离开",
   "All.Enabled": "启用",
-  "All.Disabled": "禁用",
-  "all": "所有玩家",
-  "bots": "机器人",
-  "humans": "人类玩家",
-  "alive": "存活玩家",
-  "dead": "死亡玩家",
-  "notme": "除自己外的所有玩家",
-  "ct": "CT玩家",
-  "t": "T玩家",
-  "spec": "观察者"
+  "All.Disabled": "禁用"
 }

EntWatchSharp/addons/counterstrikesharp/plugins/EntWatchSharp/lang/zh-Hans.json

@@ -1 +1 @@
-1.DZ.8.3
+1.DZ.8.4