Fix entity log formatting, prevent issues with invalid player handles…

… in PlayerFormatObject
edgegamers · Feb 6, 2024 · 236784d · 236784d
1 parent 869a66a
commit 236784d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/mod/Jailbreak.Logs/Listeners/LogEntityListeners.cs b/mod/Jailbreak.Logs/Listeners/LogEntityListeners.cs
@@ -27,8 +27,7 @@ public HookResult OnButtonPressed(CEntityIOOutput output, string name, CEntityIn
 		CBaseEntity? ent = Utilities.GetEntityFromIndex<CBaseEntity>((int)caller.Index);
 
 
-		_logs.Append(
-			$"{_logs.Player(player)} pressed a button: {ent.Entity?.Name ?? "Unlabeled"} -> {output?.Connections?.TargetDesc ?? "None"}");
+		_logs.Append(_logs.Player(player) $"pressed a button: {ent.Entity?.Name ?? "Unlabeled"} -> {output?.Connections?.TargetDesc ?? "None"}");
 		return HookResult.Continue;
 	}
 
@@ -42,8 +41,7 @@ public HookResult OnBreakableBroken(CEntityIOOutput output, string name, CEntity
 		CBaseEntity? ent = Utilities.GetEntityFromIndex<CBaseEntity>((int)caller.Index);
 
 
-		_logs.Append(
-			$"{_logs.Player(player)} broke an entity: {ent.Entity?.Name ?? "Unlabeled"} -> {output?.Connections?.TargetDesc ?? "None"}");
+		_logs.Append(_logs.Player(player), $"broke an entity: {ent.Entity?.Name ?? "Unlabeled"} -> {output?.Connections?.TargetDesc ?? "None"}");
 		return HookResult.Continue;
 	}
 }
diff --git a/public/Jailbreak.Formatting/Core/FormatObject.cs b/public/Jailbreak.Formatting/Core/FormatObject.cs
@@ -45,4 +45,7 @@ public static FormatObject FromObject(object value)
     {
         return new StringFormatObject(value.ToString() ?? "null");
     }
-}
+
+    public override string ToString()
+	    => ToPlain();
+}
diff --git a/public/Jailbreak.Formatting/Objects/PlayerFormatObject.cs b/public/Jailbreak.Formatting/Objects/PlayerFormatObject.cs
@@ -7,25 +7,25 @@ namespace Jailbreak.Formatting.Objects;
 
 public class PlayerFormatObject : FormatObject
 {
-    private readonly CCSPlayerController _player;
+    private readonly string _name;
 
     public PlayerFormatObject(CCSPlayerController player)
     {
-        _player = player;
+        _name = player.PlayerName;
     }
 
     public override string ToChat()
     {
-        return $"{ChatColors.Yellow}{_player.PlayerName}";
+        return $"{ChatColors.Yellow}{_name}";
     }
 
     public override string ToPanorama()
     {
-        return _player.PlayerName.Sanitize();
+        return _name.Sanitize();
     }
 
     public override string ToPlain()
     {
-        return _player.PlayerName;
+        return _name;
     }
-}
+}