Improve bot support

mod/TTT.Detective/DetectiveManager.cs

@@ -18,7 +18,7 @@ public class DetectiveManager(IPlayerService roleService)
   public void Start(BasePlugin parent) {
     parent.RegisterListener<Listeners.OnTick>(() => {
       foreach (var player in Utilities.GetPlayers()
-       .Where(player => player.IsValid && player.IsReal())
+       .Where(player => player is { IsValid: true, IsBot: false })
        .Where(player => (player.Buttons & PlayerButtons.Use) != 0))
         OnPlayerUse(player);
     });

mod/TTT.Logs/LogBehavior.cs

@@ -18,8 +18,7 @@ public class LogBehavior : ILogService, IPluginBehavior {
 
   public bool PrintLogs(int round) {
     if (_logs.ContainsKey(round)) return false;
-    foreach (var player in Utilities.GetPlayers().Where(plr => plr.IsReal()))
-      PrintToPlayer(player, round);
+    foreach (var player in Utilities.GetPlayers()) PrintToPlayer(player, round);
 
     PrintToConsole(round);
     return true;

mod/TTT.Logs/LogsListener.cs

@@ -17,8 +17,7 @@ public void Start(BasePlugin plugin) { }
   public HookResult OnPlayerDamage(EventPlayerHurt @event, GameEventInfo info) {
     var attackedPlayer = @event.Userid;
 
-    if (attackedPlayer == null || !attackedPlayer.IsReal())
-      return HookResult.Continue;
+    if (attackedPlayer == null) return HookResult.Continue;
 
     var attackedRole = playerService.GetPlayer(attackedPlayer).PlayerRole();
 
@@ -39,12 +38,11 @@ public HookResult OnPlayerDeath(EventPlayerDeath @event, GameEventInfo info) {
     var killedPlayer = @event.Userid;
     var killer       = @event.Attacker;
 
-    if (killedPlayer == null || !killedPlayer.IsReal())
-      return HookResult.Continue;
+    if (killedPlayer == null) return HookResult.Continue;
 
     var killedRole = playerService.GetPlayer(killedPlayer).PlayerRole();
 
-    if (killer == null || !killer.IsReal()) {
+    if (killer == null) {
       logService.AddLog(new DeathAction(
         new Tuple<CCSPlayerController, Role>(killedPlayer, killedRole)));
       return HookResult.Continue;

mod/TTT.Manager/InfoManager.cs

@@ -134,7 +134,8 @@ private HookResult OnPlayerSpectateChange(EventSpecTargetUpdated @event,
     var player = @event.Userid;
     var target = new CCSPlayerController(@event.Target);
 
-    if (!player.IsReal() || !target.IsReal()) return HookResult.Continue;
+    if (player == null || !player.IsReal() || !target.IsReal())
+      return HookResult.Continue;
 
     _spectatorLookAtRole.TryAdd(player,
       new Tuple<string, Role>(target.PlayerName,

mod/TTT.Player/AntiBlockManager.cs

@@ -23,8 +23,6 @@ private HookResult Event_PlayerSpawn(EventPlayerSpawn @event,
 
     var player = @event.Userid;
 
-    if (!player.IsReal()) return HookResult.Continue;
-
     if (!player.PlayerPawn.IsValid) return HookResult.Continue;
 
     var pawn = player.PlayerPawn;

mod/TTT.Roles/RoleBehavior.cs

@@ -44,7 +44,6 @@ public void Start(BasePlugin parent) {
 
   public void AddRoles() {
     var eligible = Utilities.GetPlayers()
-     .Where(player => player.IsReal())
      .Where(player => player.Team is not (CsTeam.Spectator or CsTeam.None))
      .ToList();
 
@@ -149,15 +148,10 @@ public HookResult
     OnRoundStart(EventRoundFreezeEnd @event, GameEventInfo info) {
     _roundService.SetRoundStatus(RoundStatus.Waiting);
     foreach (var player in Utilities.GetPlayers()
-     .Where(player => player.IsReal() && player.Team != CsTeam.None
-        || player.Team != CsTeam.Spectator)) {
+     .Where(player
+        => player.Team != CsTeam.None && player.Team != CsTeam.Spectator)) {
       player.RemoveWeapons();
-      if (!string.IsNullOrEmpty("weapon_glock"))
-        player.GiveNamedItem("weapon_glock");
-
-      if (!string.IsNullOrEmpty(string.Empty))
-        player.GiveNamedItem(string.Empty);
-
+      player.GiveNamedItem("weapon_glock");
       player.GiveNamedItem("weapon_knife");
       service.GetPlayer(player).ModifyKarma();
     }
@@ -169,8 +163,8 @@ public HookResult
   public HookResult OnPlayerConnect(EventPlayerConnectFull @event,
     GameEventInfo info) {
     if (Utilities.GetPlayers()
-     .Count(player => player.IsReal() && player.Team != CsTeam.None
-        || player.Team == CsTeam.Spectator) < 3)
+     .Count(player => player.Team != CsTeam.None
+        && player.Team != CsTeam.Spectator) < 3)
       _roundService.ForceEnd();
 
     return HookResult.Continue;
@@ -219,10 +213,7 @@ public HookResult OnPlayerDeath(EventPlayerDeath @event, GameEventInfo info) {
 
   [GameEventHandler]
   public HookResult OnRoundEnd(EventRoundEnd @event, GameEventInfo info) {
-    var players = Utilities.GetPlayers()
-     .Where(player => player.IsValid)
-     .Where(player => player.IsReal())
-     .ToList();
+    var players = Utilities.GetPlayers().ToList();
 
     foreach (var player in players)
       player.PrintToCenter(GetWinner().FormatStringFullAfter("s has won!"));
@@ -250,12 +241,10 @@ public bool IsInnocent(CCSPlayerController player) {
   }
 
   private Role GetWinner() {
-    return _traitorsLeft == 0 ? Role.Traitor : Role.Innocent;
+    return _traitorsLeft > 0 ? Role.Traitor : Role.Innocent;
   }
 
   public void SetColor(CCSPlayerController player) {
-    if (!player.IsReal()) return;
-
     var pawn = player.PlayerPawn.Value;
 
     if (pawn == null || !pawn.IsValid) return;
@@ -267,16 +256,13 @@ public void SetColor(CCSPlayerController player) {
   }
 
   public void RemoveColor(CCSPlayerController player) {
-    if (!player.IsReal()) return;
-
     var pawn = player.PlayerPawn.Value;
 
     if (pawn == null || !pawn.IsValid) return;
 
     pawn.RenderMode = RenderMode_t.kRenderTransColor;
     pawn.Render     = Color.FromArgb(254, 255, 255, 255);
 
-
     Utilities.SetStateChanged(pawn, "CBaseModelEntity", "m_clrRender");
   }
 }

mod/TTT.Round/Round.cs

@@ -23,10 +23,7 @@ public Round(IRoleService roleService, RoundConfig? config, int roundId) {
   public void Tick() {
     _graceTime--;
 
-    var players = Utilities.GetPlayers()
-     .Where(player => player.IsValid)
-     .Where(player => player.IsReal())
-     .ToList();
+    var players = Utilities.GetPlayers().ToList();
 
     var formattedColor =
       $"<font color=\"#{Color.Green.R:X2}{Color.Green.G:X2}{Color.Green.B:X2}\">";
@@ -42,7 +39,6 @@ public void Tick() {
 
   public void Start() {
     foreach (var player in Utilities.GetPlayers()
-     .Where(player => player.IsReal())
      .Where(player => !player.PawnIsAlive)
      .Where(player
         => player.Team is CsTeam.Terrorist or CsTeam.CounterTerrorist))

mod/TTT.Round/RoundBehavior.cs

@@ -75,10 +75,7 @@ public void TickWaiting() {
   }
 
   public void ForceStart() {
-    foreach (var player in Utilities.GetPlayers()
-     .Where(player => player.IsReal())
-     .Where(player => player.IsReal())
-     .ToList())
+    foreach (var player in Utilities.GetPlayers().ToList())
       player.VoiceFlags = VoiceFlags.Normal;
     _round!.Start();
     ServerExtensions.GetGameRules().RoundTime = 360;
@@ -123,7 +120,6 @@ private HookResult
     OnTeamJoin(CCSPlayerController? executor, CommandInfo info) {
     if (_roundStatus != RoundStatus.Started) return HookResult.Continue;
     if (executor == null) return HookResult.Continue;
-    if (!executor.IsReal()) return HookResult.Continue;
     if (_roleService.GetRole(executor) != Role.Unassigned)
       return HookResult.Continue;
     Server.NextFrame(() => executor.CommitSuicide(false, true));

public/TTT.Formatting/Extensions/ViewExtensions.cs

@@ -45,7 +45,7 @@ public static IView ToAllCenter(this IView view) {
 
   public static IView ToPlayerConsole(this IView view,
     CCSPlayerController player) {
-    if (!player.IsReal() || player.IsBot) return view;
+    if (!player.IsReal(false)) return view;
 
     var writer = view.ToWriter();
 
@@ -56,7 +56,7 @@ public static IView ToPlayerConsole(this IView view,
 
   public static IView
     ToPlayerChat(this IView view, CCSPlayerController player) {
-    if (!player.IsReal() || player.IsBot) return view;
+    if (!player.IsReal(false)) return view;
 
     var writer = view.ToWriter();
 
@@ -67,7 +67,7 @@ public static IView
 
   public static IView ToPlayerCenter(this IView view,
     CCSPlayerController player) {
-    if (!player.IsReal() || player.IsBot) return view;
+    if (!player.IsReal(false)) return view;
 
     var writer = view.ToWriter();
     var merged = string.Join('\n', writer.Plain);
@@ -79,7 +79,7 @@ public static IView ToPlayerCenter(this IView view,
 
   public static IView ToPlayerCenterHtml(this IView view,
     CCSPlayerController player) {
-    if (!player.IsReal() || player.IsBot) return view;
+    if (!player.IsReal(false)) return view;
 
     var writer = view.ToWriter();
     var merged = string.Join('\n', writer.Panorama);

public/TTT.Public/Extensions/PlayerExtensions.cs

@@ -77,14 +77,15 @@ public static string GetActiveWeaponName(this CCSPlayerController player) {
   }
 
 
-  public static bool IsReal(this CCSPlayerController player) {
+  public static bool IsReal(this CCSPlayerController player, bool bot = true) {
     //  Do nothing else before this:
     //  Verifies the handle points to an entity within the global entity list.
     if (!player.IsValid) return false;
 
     if (player.Connected != PlayerConnectedState.PlayerConnected) return false;
 
-    if (player.IsBot || player.IsHLTV) return false;
+    if (player.IsBot) return bot;
+    if (player.IsHLTV) return false;
 
     return true;
   }

public/TTT.Public/Extensions/ScoreboardExtension.cs

@@ -8,7 +8,6 @@ namespace TTT.Round;
 public static class ScoreboardExtension {
   public static void ModifyScoreBoard(this CCSPlayerController? player) {
     if (player == null) return;
-    if (!player.IsReal()) return;
     var actionService = player.ActionTrackingServices;
     if (actionService == null) return;