Fix conflict changes

LightlessSync/LightlessSync.csproj

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

LightlessSync/Services/DalamudUtilService.cs

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