more checks

LightlessSync/LightlessSync.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>2.0.2.71</Version>
+    <Version>2.0.2.72</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>

LightlessSync/Services/DalamudUtilService.cs

@@ -958,59 +958,100 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         if (address == nint.Zero)
             return;
 
-        var gameObj = (GameObject*)address;
-
-        if (gameObj == null || gameObj->ObjectKind == 0)
-            return;
-        var drawObj = gameObj->DrawObject;
-        bool isDrawing = false;
-        bool isDrawingChanged = false;
-        if ((nint)drawObj != IntPtr.Zero)
+        try
         {
-            isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000;
-            if (!isDrawing)
+            var gameObj = (GameObject*)address;
+
+            if (gameObj == null)
+                return;
+
+            if (!_objectTable.Any(o => o?.Address == address))
             {
-                isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0;
+                _logger.LogDebug("Character {name} at {addr} no longer in object table", characterName, address.ToString("X"));
+                return;
+            }
+
+            if (gameObj->ObjectKind == 0)
+                return;
+
+            var drawObj = gameObj->DrawObject;
+            bool isDrawing = false;
+            bool isDrawingChanged = false;
+
+            if ((nint)drawObj != IntPtr.Zero)
+            {
+                try
+                {
+                    isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000;
+                }
+                catch (AccessViolationException)
+                {
+                    return;
+                }
+
                 if (!isDrawing)
                 {
-                    isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0;
-                    if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
-                        && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
+                    try
                     {
-                        _lastGlobalBlockPlayer = characterName;
-                        _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
-                        isDrawingChanged = true;
+                        var charBase = (CharacterBase*)drawObj;
+                        if (charBase != null)
+                        {
+                            isDrawing = charBase->HasModelInSlotLoaded != 0;
+                            if (!isDrawing)
+                            {
+                                isDrawing = charBase->HasModelFilesInSlotLoaded != 0;
+                                if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
+                                    && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
+                                {
+                                    _lastGlobalBlockPlayer = characterName;
+                                    _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
+                                    isDrawingChanged = true;
+                                }
+                            }
+                            else
+                            {
+                                if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
+                                    && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal))
+                                {
+                                    _lastGlobalBlockPlayer = characterName;
+                                    _lastGlobalBlockReason = "HasModelInSlotLoaded";
+                                    isDrawingChanged = true;
+                                }
+                            }
+                        }
+                    }
+                    catch (AccessViolationException)
+                    {
+                        return;
                     }
                 }
                 else
                 {
                     if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
-                        && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal))
+                        && !string.Equals(_lastGlobalBlockReason, "RenderFlags", StringComparison.Ordinal))
                     {
                         _lastGlobalBlockPlayer = characterName;
-                        _lastGlobalBlockReason = "HasModelInSlotLoaded";
+                        _lastGlobalBlockReason = "RenderFlags";
                         isDrawingChanged = true;
                     }
                 }
             }
-            else
+
+            if (isDrawingChanged)
             {
-                if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
-                    && !string.Equals(_lastGlobalBlockReason, "RenderFlags", StringComparison.Ordinal))
-                {
-                    _lastGlobalBlockPlayer = characterName;
-                    _lastGlobalBlockReason = "RenderFlags";
-                    isDrawingChanged = true;
-                }
+                _logger.LogTrace("Global draw block: START => {name} ({reason})", characterName, _lastGlobalBlockReason);
             }
-        }
 
-        if (isDrawingChanged)
+            IsAnythingDrawing |= isDrawing;
+        }
+        catch (AccessViolationException ex)
         {
-            _logger.LogTrace("Global draw block: START => {name} ({reason})", characterName, _lastGlobalBlockReason);
+            _logger.LogDebug(ex, "Memory access violation checking character {name} at {addr}", characterName, address.ToString("X"));
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Unexpected error checking character {name} at {addr}", characterName, address.ToString("X"));
         }
-
-        IsAnythingDrawing |= isDrawing;
     }
 
     private void FrameworkOnUpdate(IFramework framework)
@@ -1039,50 +1080,74 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                     }
 
                     var playerDescriptors = _actorObjectService.PlayerDescriptors;
-                    for (var i = 0; i < playerDescriptors.Count; i++)
+                    var descriptorCount = playerDescriptors.Count;
+
+                    for (var i = 0; i < descriptorCount; i++)
                     {
-                        var actor = playerDescriptors[i];
-
-                        var playerAddress = actor.Address;
-                        if (playerAddress == nint.Zero)
-                            continue;
-
-                        if (actor.ObjectIndex >= 200)
-                            continue;
-
-                        if (_blockedCharacterHandler.IsCharacterBlocked(playerAddress, actor.ObjectIndex, out bool firstTime) && firstTime)
+                        try
                         {
-                            _logger.LogTrace("Skipping character {addr}, blocked/muted", playerAddress.ToString("X"));
-                            continue;
-                        }
+                            if (i >= playerDescriptors.Count)
+                                break;
 
-                        if (!IsAnythingDrawing)
-                        {
-                            try
+                            var actor = playerDescriptors[i];
+
+                            var playerAddress = actor.Address;
+                            if (playerAddress == nint.Zero)
+                                continue;
+
+                            if (actor.ObjectIndex >= 200)
+                                continue;
+
+                            if (_blockedCharacterHandler.IsCharacterBlocked(playerAddress, actor.ObjectIndex, out bool firstTime) && firstTime)
                             {
-                                var gameObj = (GameObject*)playerAddress;
-
-                                if (gameObj == null || gameObj->ObjectKind == 0)
-                                {
-                                    continue;
-                                }
-
-                                var currentName = gameObj->NameString ?? string.Empty;
-                                var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName;
-
-                                CheckCharacterForDrawing(playerAddress, charaName);
-
-                                if (IsAnythingDrawing)
-                                    break;
-                            }
-                            catch (AccessViolationException ex)
-                            {
-                                _logger.LogWarning(ex, "Memory access violation reading character at {addr}", playerAddress.ToString("X"));
+                                _logger.LogTrace("Skipping character {addr}, blocked/muted", playerAddress.ToString("X"));
                                 continue;
                             }
+
+                            if (!IsAnythingDrawing)
+                            {
+                                try
+                                {
+                                    var gameObj = (GameObject*)playerAddress;
+
+                                    if (gameObj == null || gameObj->ObjectKind == 0)
+                                    {
+                                        continue;
+                                    }
+
+                                    string currentName;
+                                    try
+                                    {
+                                        currentName = gameObj->NameString ?? string.Empty;
+                                    }
+                                    catch (AccessViolationException)
+                                    {
+                                        currentName = string.Empty;
+                                    }
+
+                                    var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName;
+
+                                    CheckCharacterForDrawing(playerAddress, charaName);
+
+                                    if (IsAnythingDrawing)
+                                        break;
+                                }
+                                catch (AccessViolationException ex)
+                                {
+                                    _logger.LogDebug(ex, "Access violation on GameObject pointer for actor {index} at {addr}", i, playerAddress.ToString("X"));
+                                }
+                            }
+                        }
+                        catch (AccessViolationException ex)
+                        {
+                            _logger.LogDebug(ex, "Access violation processing actor {index} - object likely destroyed", i);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.LogWarning(ex, "Unexpected error processing actor {index}", i);
                         }
                     }
-                });
+             });
 
             if (!IsAnythingDrawing && !string.IsNullOrEmpty(_lastGlobalBlockPlayer))
             {