Fix conflict changes

LightlessSync/LightlessSync.csproj

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

LightlessSync/PlayerData/Factories/PlayerDataFactory.cs

@@ -1,5 +1,4 @@
-using Dalamud.Utility;
+using FFXIVClientStructs.FFXIV.Client.Game.Character;
-using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using LightlessSync.API.Data.Enum;
 using LightlessSync.FileCache;
 using LightlessSync.Interop.Ipc;
@@ -12,8 +11,6 @@ using LightlessSync.Services.Mediator;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.Diagnostics;
-using System.Runtime.ExceptionServices;
-using System.Runtime.InteropServices;
 
 namespace LightlessSync.PlayerData.Factories;
 
@@ -126,37 +123,21 @@ public class PlayerDataFactory
     {
         if (playerPointer == IntPtr.Zero)
             return true;
-
-        if (!IsPointerValid(playerPointer))
-            return true;
-
-        var character = (Character*)playerPointer;
-        if (character == null)
-            return true;
-
-        var gameObject = &character->GameObject;
-        if (gameObject == null)
-            return true;
-
-        if (!IsPointerValid((IntPtr)gameObject))
-            return true;
-
-        return gameObject->DrawObject == null;
-    }
-
-    private static bool IsPointerValid(IntPtr ptr)
-    {
-        if (ptr == IntPtr.Zero)
-            return false;
-
         try
         {
-            _ = Marshal.ReadByte(ptr);
+            var character = (Character*)playerPointer;
-            return true;
+            if (character == null)
+                return true;
+
+            var gameObject = &character->GameObject;
+            if (gameObject == null)
+                return true;
+
+            return gameObject->DrawObject == null;
         }
-        catch
+        catch (AccessViolationException)
         {
-            return false;
+            return true;
         }
     }
 
@@ -556,11 +537,6 @@ public class PlayerDataFactory
 
             var hash = g.Key;
 
-            var resolvedPath = g.Select(f => f.ResolvedPath).Distinct(StringComparer.OrdinalIgnoreCase);
-            var papPathSummary = string.Join(", ", resolvedPath);
-            if (papPathSummary.IsNullOrEmpty())
-                papPathSummary = "<unknown pap path>";
-
             Dictionary<string, List<ushort>>? papIndices = null;
 
             await _papParseLimiter.WaitAsync(ct).ConfigureAwait(false);
@@ -612,8 +588,8 @@ public class PlayerDataFactory
             noValidationFailed++;
 
             _logger.LogWarning(
-                "Animation PAP is not compatible with local skeletons; dropping mappings for {papPath}. Reason: {reason}",
+                "Animation PAP hash {hash} is not compatible with local skeletons; dropping all mappings for this hash. Reason: {reason}",
-                papPathSummary,
+                hash,
                 reason);
 
             var removedGamePaths = fragment.FileReplacements

LightlessSync/PlayerData/Handlers/GameObjectHandler.cs

@@ -78,6 +78,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
             if (msg.Address == Address)
             {
                 _haltProcessing = false;
+                Refresh();
             }
         });
 
@@ -113,16 +114,16 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
     public async Task ActOnFrameworkAfterEnsureNoDrawAsync(Action<Dalamud.Game.ClientState.Objects.Types.ICharacter> act, CancellationToken token)
     {
         while (await _dalamudUtil.RunOnFrameworkThread(() =>
-        {
+               {
-            EnsureLatestObjectState();
+                   EnsureLatestObjectState();
-            if (CurrentDrawCondition != DrawCondition.None) return true;
+                   if (CurrentDrawCondition != DrawCondition.None) return true;
-            var gameObj = _dalamudUtil.CreateGameObject(Address);
+                   var gameObj = _dalamudUtil.CreateGameObject(Address);
-            if (gameObj is Dalamud.Game.ClientState.Objects.Types.ICharacter chara)
+                   if (gameObj is Dalamud.Game.ClientState.Objects.Types.ICharacter chara)
-            {
+                   {
-                act.Invoke(chara);
+                       act.Invoke(chara);
-            }
+                   }
-            return false;
+                   return false;
-        }).ConfigureAwait(false))
+               }).ConfigureAwait(false))
         {
             await Task.Delay(250, token).ConfigureAwait(false);
         }
@@ -169,13 +170,19 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         return $"{owned}/{ObjectKind}:{Name} ({Address:X},{DrawObjectAddress:X})";
     }
 
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+
+        Mediator.Publish(new GameObjectHandlerDestroyedMessage(this, _isOwnedObject));
+    }
+
     private void CheckAndUpdateObject() => CheckAndUpdateObject(allowPublish: true);
 
-    private unsafe void CheckAndUpdateObject(bool allowPublish)
+    private unsafe void CheckAndUpdateObject(bool allowPublish = true)
     {
         var prevAddr = Address;
         var prevDrawObj = DrawObjectAddress;
-        string? nameString = null;
 
         Address = _getAddress();
 
@@ -186,9 +193,10 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
             EntityId = gameObject->EntityId;
 
             var chara = (Character*)Address;
-            nameString = chara->GameObject.NameString;
+            var newName = chara->GameObject.NameString;
-            if (!string.IsNullOrEmpty(nameString) && !string.Equals(nameString, Name, StringComparison.Ordinal))
+
-                Name = nameString;
+            if (!string.IsNullOrEmpty(newName) && !string.Equals(newName, Name, StringComparison.Ordinal))
+                Name = newName;
         }
         else
         {
@@ -206,18 +214,16 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
         if (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero)
         {
             var chara = (Character*)Address;
-            var drawObj = (DrawObject*)DrawObjectAddress;
+            var name = chara->GameObject.NameString;
-            var objType = drawObj->Object.GetObjectType();
+            bool nameChange = !string.Equals(name, Name, StringComparison.Ordinal);
-            var isHuman = objType == ObjectType.CharacterBase
+            if (nameChange)
-                          && ((CharacterBase*)drawObj)->GetModelType() == CharacterBase.ModelType.Human;
+            {
-
+                Name = name;
-            nameString ??= ((Character*)Address)->GameObject.NameString;
+            }
-            var nameChange = !string.Equals(nameString, Name, StringComparison.Ordinal);
-            if (nameChange) Name = nameString;
-
             bool equipDiff = false;
 
-            if (isHuman)
+            if (((DrawObject*)DrawObjectAddress)->Object.GetObjectType() == ObjectType.CharacterBase
+                && ((CharacterBase*)DrawObjectAddress)->GetModelType() == CharacterBase.ModelType.Human)
             {
                 var classJob = chara->CharacterData.ClassJob;
                 if (classJob != _classJob)
@@ -227,7 +233,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
                     Mediator.Publish(new ClassJobChangedMessage(this));
                 }
 
-                equipDiff = CompareAndUpdateEquipByteData((byte*)&((Human*)drawObj)->Head);
+                equipDiff = CompareAndUpdateEquipByteData((byte*)&((Human*)DrawObjectAddress)->Head);
 
                 ref var mh = ref chara->DrawData.Weapon(WeaponSlot.MainHand);
                 ref var oh = ref chara->DrawData.Weapon(WeaponSlot.OffHand);
@@ -252,11 +258,12 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
 
             bool customizeDiff = false;
 
-            if (isHuman)
+            if (((DrawObject*)DrawObjectAddress)->Object.GetObjectType() == ObjectType.CharacterBase
+                && ((CharacterBase*)DrawObjectAddress)->GetModelType() == CharacterBase.ModelType.Human)
             {
-                var gender = ((Human*)drawObj)->Customize.Sex;
+                var gender = ((Human*)DrawObjectAddress)->Customize.Sex;
-                var raceId = ((Human*)drawObj)->Customize.Race;
+                var raceId = ((Human*)DrawObjectAddress)->Customize.Race;
-                var tribeId = ((Human*)drawObj)->Customize.Tribe;
+                var tribeId = ((Human*)DrawObjectAddress)->Customize.Tribe;
 
                 if (_isOwnedObject && ObjectKind == ObjectKind.Player
                     && (gender != Gender || raceId != RaceId || tribeId != TribeId))
@@ -267,7 +274,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
                     TribeId = tribeId;
                 }
 
-                customizeDiff = CompareAndUpdateCustomizeData(((Human*)drawObj)->Customize.Data);
+                customizeDiff = CompareAndUpdateCustomizeData(((Human*)DrawObjectAddress)->Customize.Data);
                 if (customizeDiff)
                     Logger.LogTrace("Checking [{this}] customize data as human from draw obj, result: {diff}", this, customizeDiff);
             }

LightlessSync/Services/DalamudUtilService.cs

@@ -705,7 +705,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         if (location.ServerId is 0 || location.TerritoryId is 0) return String.Empty;
         var str = WorldData.Value[(ushort)location.ServerId];
 
-        if (ContentFinderData.Value.TryGetValue(location.TerritoryId, out var dutyName))
+        if (ContentFinderData.Value.TryGetValue(location.TerritoryId , out var dutyName))
         {
             str += $" - [In Duty]{dutyName}";
         }
@@ -881,7 +881,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         {
             // ignore
         }
-        catch (Exception ex)
+        catch (AccessViolationException ex)
         {
             logger.LogWarning(ex, "Error accessing {handler}, object does not exist anymore?", handler);
         }
@@ -953,87 +953,37 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
         });
     }
 
-    [DllImport("kernel32.dll", SetLastError = true)]
-    private static extern bool IsBadReadPtr(IntPtr ptr, UIntPtr size);
-
-    private static bool IsValidPointer(nint ptr, int size = 8)
-    {
-        if (ptr == nint.Zero)
-            return false;
-
-        try
-        {
-            if (!Util.IsWine())
-            {
-                return !IsBadReadPtr(ptr, (UIntPtr)size);
-            }
-            return ptr != nint.Zero && (ptr % IntPtr.Size) == 0;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
     private unsafe void CheckCharacterForDrawing(nint address, string characterName)
     {
-        if (address == nint.Zero)
-            return;
-
-        if (!IsValidPointer(address))
-        {
-            _logger.LogDebug("Invalid pointer for character {name} at {addr}", characterName, address.ToString("X"));
-            return;
-        }
-
         var gameObj = (GameObject*)address;
-
-        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"));
-            return;
-        }
-
-        if (gameObj->ObjectKind == 0)
-            return;
-
         var drawObj = gameObj->DrawObject;
         bool isDrawing = false;
         bool isDrawingChanged = false;
-
+        if ((nint)drawObj != IntPtr.Zero)
-        if ((nint)drawObj != IntPtr.Zero && IsValidPointer((nint)drawObj))
         {
             isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000;
-
             if (!isDrawing)
             {
-                var charBase = (CharacterBase*)drawObj;
+                isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0;
-                if (charBase != null && IsValidPointer((nint)charBase))
+                if (!isDrawing)
                 {
-                    isDrawing = charBase->HasModelInSlotLoaded != 0;
+                    isDrawing = ((CharacterBase*)drawObj)->HasModelFilesInSlotLoaded != 0;
-                    if (!isDrawing)
+                    if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
+                        && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
                     {
-                        isDrawing = charBase->HasModelFilesInSlotLoaded != 0;
+                        _lastGlobalBlockPlayer = characterName;
-                        if (isDrawing && !string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
+                        _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
-                            && !string.Equals(_lastGlobalBlockReason, "HasModelFilesInSlotLoaded", StringComparison.Ordinal))
+                        isDrawingChanged = true;
-                        {
-                            _lastGlobalBlockPlayer = characterName;
-                            _lastGlobalBlockReason = "HasModelFilesInSlotLoaded";
-                            isDrawingChanged = true;
-                        }
                     }
-                    else
+                }
+                else
+                {
+                    if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
+                        && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal))
                     {
-                        if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
+                        _lastGlobalBlockPlayer = characterName;
-                            && !string.Equals(_lastGlobalBlockReason, "HasModelInSlotLoaded", StringComparison.Ordinal))
+                        _lastGlobalBlockReason = "HasModelInSlotLoaded";
-                        {
+                        isDrawingChanged = true;
-                            _lastGlobalBlockPlayer = characterName;
-                            _lastGlobalBlockReason = "HasModelInSlotLoaded";
-                            isDrawingChanged = true;
-                        }
                     }
                 }
             }
@@ -1064,11 +1014,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
     private unsafe void FrameworkOnUpdateInternal()
     {
-        if (!_clientState.IsLoggedIn || _objectTable.LocalPlayer == null)
-        {
-            return;
-        }
-
         if ((_objectTable.LocalPlayer?.IsDead ?? false) && _condition[ConditionFlag.BoundByDuty])
         {
             return;
@@ -1088,17 +1033,12 @@ 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++)
                     {
-                        if (i >= playerDescriptors.Count)
-                            break;
-
                         var actor = playerDescriptors[i];
 
                         var playerAddress = actor.Address;
-                        if (playerAddress == nint.Zero || !IsValidPointer(playerAddress))
+                        if (playerAddress == nint.Zero)
                             continue;
 
                         if (actor.ObjectIndex >= 200)
@@ -1112,16 +1052,17 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
                         if (!IsAnythingDrawing)
                         {
-                            if (!_objectTable.Any(o => o?.Address == playerAddress))
+                            var gameObj = (GameObject*)playerAddress;
-                            {
+                            var currentName = gameObj != null ? gameObj->NameString ?? string.Empty : string.Empty;
-                                continue;
+                            var charaName = string.IsNullOrEmpty(currentName) ? actor.Name : currentName;
-                            }
+                            CheckCharacterForDrawing(playerAddress, charaName);
-
-                            CheckCharacterForDrawing(playerAddress, actor.Name);
-
                             if (IsAnythingDrawing)
                                 break;
                         }
+                        else
+                        {
+                            break;
+                        }
                     }
                 });
 
@@ -1190,7 +1131,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                 });
 
             // Cutscene
-            HandleStateTransition(() => IsInCutscene, v => IsInCutscene = v, shouldBeInCutscene, "Cutscene",
+            HandleStateTransition(() => IsInCutscene,v => IsInCutscene = v, shouldBeInCutscene, "Cutscene",
                 onEnter: () =>
                 {
                     Mediator.Publish(new CutsceneStartMessage());