Fix conflict changes

LightlessSync/LightlessSync.csproj

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

LightlessSync/Services/DalamudUtilService.cs

@@ -955,13 +955,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
     private unsafe void CheckCharacterForDrawing(nint address, string characterName)
     {
-        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;
@@ -1058,28 +1052,16 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
                         if (!IsAnythingDrawing)
                         {
-                            try
-                            {
-                                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"));
-                                continue;
-                            }
+                            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;
+                        }
+                        else
+                        {
+                            break;
                         }
                     }
                 });