Lightless-Sync/LightlessClient
8
1
Fork 2
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 51 Wiki Activity

Merge branch '2.0.3' into dev

Browse Source
This commit is contained in:
defnotken
2026-01-05 17:41:48 -06:00
parent ab305a249c 032201ed9e
commit db2d19bb1e
3 changed files with 193 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
LightlessSync/PlayerData/Factories/PlayerDataFactory.cs
View File

@@ -1,4 +1,5 @@
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using Dalamud.Utility;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using LightlessSync.API.Data.Enum;
using LightlessSync.FileCache;
using LightlessSync.Interop.Ipc;
@@ -11,6 +12,8 @@ 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;
@@ -123,8 +126,10 @@ public class PlayerDataFactory
{
if (playerPointer == IntPtr.Zero)
return true;
try
{
if (!IsPointerValid(playerPointer))
return true;
var character = (Character*)playerPointer;
if (character == null)
return true;
@@ -133,12 +138,26 @@ public class PlayerDataFactory
if (gameObject == null)
return true;
if (!IsPointerValid((IntPtr)gameObject))
return true;
return gameObject->DrawObject == null;
}
catch (AccessViolationException)
private static bool IsPointerValid(IntPtr ptr)
{
if (ptr == IntPtr.Zero)
return false;
try
{
_ = Marshal.ReadByte(ptr);
return true;
}
catch
{
return false;
}
}
private static bool IsCacheFresh(CacheEntry entry)
@@ -537,6 +556,11 @@ 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);
@@ -588,8 +612,8 @@ public class PlayerDataFactory
noValidationFailed++;
_logger.LogWarning(
"Animation PAP hash {hash} is not compatible with local skeletons; dropping all mappings for this hash. Reason: {reason}",
hash,
"Animation PAP is not compatible with local skeletons; dropping mappings for {papPath}. Reason: {reason}",
papPathSummary,
reason);
var removedGamePaths = fragment.FileReplacements

49
LightlessSync/PlayerData/Handlers/GameObjectHandler.cs
View File

@@ -78,7 +78,6 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
if (msg.Address == Address)
{
_haltProcessing = false;
Refresh();
}
});
@@ -170,19 +169,13 @@ 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 = true)
private unsafe void CheckAndUpdateObject(bool allowPublish)
{
var prevAddr = Address;
var prevDrawObj = DrawObjectAddress;
string? nameString = null;
Address = _getAddress();
@@ -193,10 +186,9 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
EntityId = gameObject->EntityId;
var chara = (Character*)Address;
var newName = chara->GameObject.NameString;
if (!string.IsNullOrEmpty(newName) && !string.Equals(newName, Name, StringComparison.Ordinal))
Name = newName;
nameString = chara->GameObject.NameString;
if (!string.IsNullOrEmpty(nameString) && !string.Equals(nameString, Name, StringComparison.Ordinal))
Name = nameString;
}
else
{
@@ -214,16 +206,18 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
if (Address != IntPtr.Zero && DrawObjectAddress != IntPtr.Zero)
{
var chara = (Character*)Address;
var name = chara->GameObject.NameString;
bool nameChange = !string.Equals(name, Name, StringComparison.Ordinal);
if (nameChange)
{
Name = name;
}
var drawObj = (DrawObject*)DrawObjectAddress;
var objType = drawObj->Object.GetObjectType();
var isHuman = objType == ObjectType.CharacterBase
&& ((CharacterBase*)drawObj)->GetModelType() == CharacterBase.ModelType.Human;
nameString ??= ((Character*)Address)->GameObject.NameString;
var nameChange = !string.Equals(nameString, Name, StringComparison.Ordinal);
if (nameChange) Name = nameString;
bool equipDiff = false;
if (((DrawObject*)DrawObjectAddress)->Object.GetObjectType() == ObjectType.CharacterBase
&& ((CharacterBase*)DrawObjectAddress)->GetModelType() == CharacterBase.ModelType.Human)
if (isHuman)
{
var classJob = chara->CharacterData.ClassJob;
if (classJob != _classJob)
@@ -233,7 +227,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
Mediator.Publish(new ClassJobChangedMessage(this));
}
equipDiff = CompareAndUpdateEquipByteData((byte*)&((Human*)DrawObjectAddress)->Head);
equipDiff = CompareAndUpdateEquipByteData((byte*)&((Human*)drawObj)->Head);
ref var mh = ref chara->DrawData.Weapon(WeaponSlot.MainHand);
ref var oh = ref chara->DrawData.Weapon(WeaponSlot.OffHand);
@@ -258,12 +252,11 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
bool customizeDiff = false;
if (((DrawObject*)DrawObjectAddress)->Object.GetObjectType() == ObjectType.CharacterBase
&& ((CharacterBase*)DrawObjectAddress)->GetModelType() == CharacterBase.ModelType.Human)
if (isHuman)
{
var gender = ((Human*)DrawObjectAddress)->Customize.Sex;
var raceId = ((Human*)DrawObjectAddress)->Customize.Race;
var tribeId = ((Human*)DrawObjectAddress)->Customize.Tribe;
var gender = ((Human*)drawObj)->Customize.Sex;
var raceId = ((Human*)drawObj)->Customize.Race;
var tribeId = ((Human*)drawObj)->Customize.Tribe;
if (_isOwnedObject && ObjectKind == ObjectKind.Player
&& (gender != Gender || raceId != RaceId || tribeId != TribeId))
@@ -274,7 +267,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase, IHighP
TribeId = tribeId;
}
customizeDiff = CompareAndUpdateCustomizeData(((Human*)DrawObjectAddress)->Customize.Data);
customizeDiff = CompareAndUpdateCustomizeData(((Human*)drawObj)->Customize.Data);
if (customizeDiff)
Logger.LogTrace("Checking [{this}] customize data as human from draw obj, result: {diff}", this, customizeDiff);
}

100
LightlessSync/Services/DalamudUtilService.cs
View File

@@ -881,7 +881,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
{
// ignore
}
catch (AccessViolationException ex)
catch (Exception ex)
{
logger.LogWarning(ex, "Error accessing {handler}, object does not exist anymore?", handler);
}
@@ -953,13 +953,39 @@ 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;
try
if (!IsValidPointer(address))
{
_logger.LogDebug("Invalid pointer for character {name} at {addr}", characterName, address.ToString("X"));
return;
}
var gameObj = (GameObject*)address;
if (gameObj == null)
@@ -978,23 +1004,14 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
bool isDrawing = false;
bool isDrawingChanged = false;
if ((nint)drawObj != IntPtr.Zero)
{
try
if ((nint)drawObj != IntPtr.Zero && IsValidPointer((nint)drawObj))
{
isDrawing = gameObj->RenderFlags == (VisibilityFlags)0b100000000000;
}
catch (AccessViolationException)
{
return;
}
if (!isDrawing)
{
try
{
var charBase = (CharacterBase*)drawObj;
if (charBase != null)
if (charBase != null && IsValidPointer((nint)charBase))
{
isDrawing = charBase->HasModelInSlotLoaded != 0;
if (!isDrawing)
@@ -1020,11 +1037,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
}
}
}
catch (AccessViolationException)
{
return;
}
}
else
{
if (!string.Equals(_lastGlobalBlockPlayer, characterName, StringComparison.Ordinal)
@@ -1044,15 +1056,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
IsAnythingDrawing |= isDrawing;
}
catch (AccessViolationException ex)
{
_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"));
}
}
private void FrameworkOnUpdate(IFramework framework)
{
@@ -1061,6 +1064,11 @@ 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;
@@ -1083,8 +1091,6 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
var descriptorCount = playerDescriptors.Count;
for (var i = 0; i < descriptorCount; i++)
{
try
{
if (i >= playerDescriptors.Count)
break;
@@ -1092,7 +1098,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
var actor = playerDescriptors[i];
var playerAddress = actor.Address;
if (playerAddress == nint.Zero)
if (playerAddress == nint.Zero || !IsValidPointer(playerAddress))
continue;
if (actor.ObjectIndex >= 200)
@@ -1106,46 +1112,16 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
if (!IsAnythingDrawing)
{
try
{
var gameObj = (GameObject*)playerAddress;
if (gameObj == null || gameObj->ObjectKind == 0)
if (!_objectTable.Any(o => o?.Address == playerAddress))
{
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);
CheckCharacterForDrawing(playerAddress, actor.Name);
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);
}
}
});