- Fix bot targeting

Hackmastr · Hackmastr · commit 40b7ff30fa13 · 2023-12-09T18:03:24.000+01:00
diff --git a/BasicAdmin/BasicAdmin.cs b/BasicAdmin/BasicAdmin.cs
@@ -164,7 +164,7 @@ public void OnKickCommand(CCSPlayerController? caller, CommandInfo info)
         
         target?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -184,7 +184,7 @@ public void OnSlayCommand(CCSPlayerController? caller, CommandInfo info)
     {
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -223,7 +223,7 @@ public void OnSwapCommand(CCSPlayerController? caller, CommandInfo info)
         var target = GetTarget(info);
         target?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -251,7 +251,7 @@ public void OnForceSpecCommand(CCSPlayerController? caller, CommandInfo info)
         var target = GetTarget(info);
         target?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -271,14 +271,15 @@ public void OnRespawnCommand(CCSPlayerController? caller, CommandInfo info)
         var target = GetTarget(info);
         target?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
             }
+            
             player.Respawn();
         
-            if (Config.HideActivity)
+            if (!Config.HideActivity)
                 Server.PrintToChatAll(FormatAdminMessage($"{caller!.PlayerName} respawned {player.PlayerName}."));
         });
     }
@@ -375,7 +376,7 @@ public void OnBuryCommand(CCSPlayerController? caller, CommandInfo info)
         
         target?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -398,7 +399,7 @@ public void OnUnburyCommand(CCSPlayerController? caller, CommandInfo info)
     {
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -418,7 +419,7 @@ public void OnDisarmCommand(CCSPlayerController? caller, CommandInfo info)
     {
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -444,7 +445,7 @@ public void OnHealthCommand(CCSPlayerController? caller, CommandInfo info)
 
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -540,7 +541,7 @@ public void OnSlapCommand(CCSPlayerController? caller, CommandInfo info)
 
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -568,7 +569,7 @@ public void OnFreezeCommand(CCSPlayerController? caller, CommandInfo info)
         
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -590,7 +591,7 @@ public void OnUnfreezeCommand(CCSPlayerController? caller, CommandInfo info)
     {
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -610,7 +611,7 @@ public void OnNoclipCommand(CCSPlayerController? caller, CommandInfo info)
     {
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -630,7 +631,7 @@ public void OnGodmodeCommand(CCSPlayerController? caller, CommandInfo info)
     {
         GetTarget(info)?.Players.ForEach(player =>
         {
-            if (!AdminManager.CanPlayerTarget(caller, player))
+            if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))
             {
                 info.ReplyToCommand(FormatMessage("You can't target this player."));
                 return;
@@ -668,7 +669,8 @@ public void OnVoteCommand(CCSPlayerController? caller, CommandInfo info)
             return;
         }
 
-        // Voting.StartVote(caller, info);
+        // Server.PrintToChatAll(FormatAdminMessage($"{caller!.PlayerName} started a vote \u2029: {ChatColors.Blue}{info.GetArg(1)}"));
+        // new Vote(caller, info).Start();
     }
     
     private static CSSTargetResult? GetTarget(CommandInfo info)

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public void OnKickCommand(CCSPlayerController? caller, CommandInfo info)`
`164`	`164`
`165`	`165`	`target?.Players.ForEach(player =>`
`166`	`166`	`{`
`167`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`167`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`168`	`168`	`{`
`169`	`169`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`170`	`170`	`return;`
`@@ -184,7 +184,7 @@ public void OnSlayCommand(CCSPlayerController? caller, CommandInfo info)`
`184`	`184`	`{`
`185`	`185`	`GetTarget(info)?.Players.ForEach(player =>`
`186`	`186`	`{`
`187`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`187`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`188`	`188`	`{`
`189`	`189`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`190`	`190`	`return;`
`@@ -223,7 +223,7 @@ public void OnSwapCommand(CCSPlayerController? caller, CommandInfo info)`
`223`	`223`	`var target = GetTarget(info);`
`224`	`224`	`target?.Players.ForEach(player =>`
`225`	`225`	`{`
`226`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`226`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`227`	`227`	`{`
`228`	`228`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`229`	`229`	`return;`
`@@ -251,7 +251,7 @@ public void OnForceSpecCommand(CCSPlayerController? caller, CommandInfo info)`
`251`	`251`	`var target = GetTarget(info);`
`252`	`252`	`target?.Players.ForEach(player =>`
`253`	`253`	`{`
`254`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`254`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`255`	`255`	`{`
`256`	`256`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`257`	`257`	`return;`
`@@ -271,14 +271,15 @@ public void OnRespawnCommand(CCSPlayerController? caller, CommandInfo info)`
`271`	`271`	`var target = GetTarget(info);`
`272`	`272`	`target?.Players.ForEach(player =>`
`273`	`273`	`{`
`274`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`274`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`275`	`275`	`{`
`276`	`276`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`277`	`277`	`return;`
`278`	`278`	`}`
	`279`	`+`
`279`	`280`	`player.Respawn();`
`280`	`281`
`281`		`- if (Config.HideActivity)`
	`282`	`+ if (!Config.HideActivity)`
`282`	`283`	`Server.PrintToChatAll(FormatAdminMessage($"{caller!.PlayerName} respawned {player.PlayerName}."));`
`283`	`284`	`});`
`284`	`285`	`}`
`@@ -375,7 +376,7 @@ public void OnBuryCommand(CCSPlayerController? caller, CommandInfo info)`
`375`	`376`
`376`	`377`	`target?.Players.ForEach(player =>`
`377`	`378`	`{`
`378`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`379`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`379`	`380`	`{`
`380`	`381`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`381`	`382`	`return;`
`@@ -398,7 +399,7 @@ public void OnUnburyCommand(CCSPlayerController? caller, CommandInfo info)`
`398`	`399`	`{`
`399`	`400`	`GetTarget(info)?.Players.ForEach(player =>`
`400`	`401`	`{`
`401`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`402`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`402`	`403`	`{`
`403`	`404`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`404`	`405`	`return;`
`@@ -418,7 +419,7 @@ public void OnDisarmCommand(CCSPlayerController? caller, CommandInfo info)`
`418`	`419`	`{`
`419`	`420`	`GetTarget(info)?.Players.ForEach(player =>`
`420`	`421`	`{`
`421`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`422`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`422`	`423`	`{`
`423`	`424`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`424`	`425`	`return;`
`@@ -444,7 +445,7 @@ public void OnHealthCommand(CCSPlayerController? caller, CommandInfo info)`
`444`	`445`
`445`	`446`	`GetTarget(info)?.Players.ForEach(player =>`
`446`	`447`	`{`
`447`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`448`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`448`	`449`	`{`
`449`	`450`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`450`	`451`	`return;`
`@@ -540,7 +541,7 @@ public void OnSlapCommand(CCSPlayerController? caller, CommandInfo info)`
`540`	`541`
`541`	`542`	`GetTarget(info)?.Players.ForEach(player =>`
`542`	`543`	`{`
`543`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`544`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`544`	`545`	`{`
`545`	`546`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`546`	`547`	`return;`
`@@ -568,7 +569,7 @@ public void OnFreezeCommand(CCSPlayerController? caller, CommandInfo info)`
`568`	`569`
`569`	`570`	`GetTarget(info)?.Players.ForEach(player =>`
`570`	`571`	`{`
`571`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`572`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`572`	`573`	`{`
`573`	`574`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`574`	`575`	`return;`
`@@ -590,7 +591,7 @@ public void OnUnfreezeCommand(CCSPlayerController? caller, CommandInfo info)`
`590`	`591`	`{`
`591`	`592`	`GetTarget(info)?.Players.ForEach(player =>`
`592`	`593`	`{`
`593`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`594`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`594`	`595`	`{`
`595`	`596`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`596`	`597`	`return;`
`@@ -610,7 +611,7 @@ public void OnNoclipCommand(CCSPlayerController? caller, CommandInfo info)`
`610`	`611`	`{`
`611`	`612`	`GetTarget(info)?.Players.ForEach(player =>`
`612`	`613`	`{`
`613`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`614`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`614`	`615`	`{`
`615`	`616`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`616`	`617`	`return;`
`@@ -630,7 +631,7 @@ public void OnGodmodeCommand(CCSPlayerController? caller, CommandInfo info)`
`630`	`631`	`{`
`631`	`632`	`GetTarget(info)?.Players.ForEach(player =>`
`632`	`633`	`{`
`633`		`- if (!AdminManager.CanPlayerTarget(caller, player))`
	`634`	`+ if (!player.IsBot && !AdminManager.CanPlayerTarget(caller, player))`
`634`	`635`	`{`
`635`	`636`	`info.ReplyToCommand(FormatMessage("You can't target this player."));`
`636`	`637`	`return;`
`@@ -668,7 +669,8 @@ public void OnVoteCommand(CCSPlayerController? caller, CommandInfo info)`
`668`	`669`	`return;`
`669`	`670`	`}`
`670`	`671`
`671`		`- // Voting.StartVote(caller, info);`
	`672`	`+ // Server.PrintToChatAll(FormatAdminMessage($"{caller!.PlayerName} started a vote \u2029: {ChatColors.Blue}{info.GetArg(1)}"));`
	`673`	`+ // new Vote(caller, info).Start();`
`672`	`674`	`}`
`673`	`675`
`674`	`676`	`private static CSSTargetResult? GetTarget(CommandInfo info)`