- API 14

ChatTwo/Ui/ChatLogWindow.cs

@@ -1772,8 +1772,8 @@ public sealed class ChatLogWindow : Window
         {
             if (chunk.Link is PlayerPayload playerPayload)
                 content = HidePlayerInString(content, playerPayload.PlayerName, playerPayload.World.RowId);
-            else if (Plugin.ClientState.LocalPlayer is { } player)
-                content = HidePlayerInString(content, player.Name.TextValue, player.HomeWorld.RowId);
+            else if (Plugin.PlayerState.IsLoaded)
+                content = HidePlayerInString(content, Plugin.PlayerState.CharacterName, Plugin.PlayerState.HomeWorld.RowId);
         }
 
         if (wrap)

ChatTwo/Ui/DbViewer.cs

@@ -128,7 +128,7 @@ public class DbViewer : Window
             {
                 try
                 {
-                    ulong? character = OnlyCurrentCharacter ? Plugin.ClientState.LocalContentId : null;
+                    ulong? character = OnlyCurrentCharacter ? Plugin.PlayerState.ContentId : null;
                     var channels = ChatCodes.Select(c => (uint) c.Key).ToArray();
 
                     // We only want to fetch count if this is the first page

ChatTwo/Ui/SettingsTabs/Database.cs

@@ -161,8 +161,8 @@ internal sealed class Database : ISettingsTab
 
         // Generate
         var stopwatch = Stopwatch.StartNew();
-        var playerName = Plugin.ClientState.LocalPlayer?.Name.ToString() ?? "Unknown Player";
-        var worldId = Plugin.ClientState.LocalPlayer?.HomeWorld.RowId ?? 0;
+        var playerName = Plugin.PlayerState.CharacterName;
+        var worldId = Plugin.PlayerState.HomeWorld.ValueNullable?.RowId ?? 0;
         var senderSource = new SeStringBuilder()
             .AddText("<")
             .Add(new PlayerPayload(playerName, worldId))